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

* Remove Element _index and _datasetIndex for real this time

* Remove unused _datasetIndex

diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index 43afbc113788f71a1e80b527fc032026fbb0e800..e363edd3420ec018f7d58585460a269fc44b20f2 100644 (file)
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -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);
        },

diff --git a/test/specs/controller.bar.tests.js b/test/specs/controller.bar.tests.js
index b46352d9c1981b12ee5a89d77dfa5f5cd01e9904..29c76c0c993d4ee7b6fee6bb06a0e2e2d460cc5f 100644 (file)
--- a/test/specs/controller.bar.tests.js
+++ b/test/specs/controller.bar.tests.js
@@ -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);

diff --git a/test/specs/controller.line.tests.js b/test/specs/controller.line.tests.js
index 2216753c46eae627a5606036f5d2f0e436499224..5e811cb4d9ae4196796ff8a1859c213a8d495015 100644 (file)
--- a/test/specs/controller.line.tests.js
+++ b/test/specs/controller.line.tests.js
@@ -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({