archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Remove Element _index and _datasetIndex for real this time (#6726)

Browse Source 
* Remove Element _index and _datasetIndex for real this time

* Remove unused _datasetIndex
This commit is contained in:
Ben McCann 2019-11-12 16:18:29 -08:00 committed by Evert Timberg
parent 30cbdc6a4d
commit 09ef08acfe
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/core.datasetController.js
View File

@ -315,18 +315,15 @@ helpers.extend(DatasetController.prototype, {
var me = this;
var type = me.datasetElementType;
return type && new type({
_ctx: me.chart.ctx,
_datasetIndex: me.index
_ctx: me.chart.ctx
});
},
createMetaData: function(index) {
createMetaData: function() {
var me = this;
var type = me.dataElementType;
return type && new type({
_ctx: me.chart.ctx,
_datasetIndex: me.index,
_index: index,
_parsed: {}
});
},
@ -398,14 +395,14 @@ helpers.extend(DatasetController.prototype, {
data = me._data;
for (i = 0, ilen = data.length; i < ilen; ++i) {
metaData[i] = metaData[i] || me.createMetaData(i);
metaData[i] = metaData[i] || me.createMetaData();
}
meta.dataset = meta.dataset || me.createMetaDataset();
},
addElementAndReset: function(index) {
var element = this.createMetaData(index);
var element = this.createMetaData();
this._cachedMeta.data.splice(index, 0, element);
this.updateElement(element, index, true);
},

2
test/specs/controller.bar.tests.js
View File

@ -739,8 +739,6 @@ describe('Chart.controllers.bar', function() {
{x: 89, y: 512},
{x: 217, y: 0}
].forEach(function(expected, i) {
expect(meta.data[i]._datasetIndex).toBe(1);
expect(meta.data[i]._index).toBe(i);
expect(meta.data[i]._model.x).toBeCloseToPixel(expected.x);
expect(meta.data[i]._model.y).toBeCloseToPixel(expected.y);
expect(meta.data[i]._model.base).toBeCloseToPixel(1024);

2
test/specs/controller.line.tests.js
View File

@ -215,8 +215,6 @@ describe('Chart.controllers.line', function() {
{x: 0, y: 512},
{x: 171, y: 0}
].forEach(function(expected, i) {
expect(meta.data[i]._datasetIndex).toBe(0);
expect(meta.data[i]._index).toBe(i);
expect(meta.data[i]._model.x).toBeCloseToPixel(expected.x);
expect(meta.data[i]._model.y).toBeCloseToPixel(expected.y);
expect(meta.data[i]._model).toEqual(jasmine.objectContaining({