From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Wed, 13 Nov 2019 00:18:29 +0000 (-0800)
Subject: Remove Element _index and _datasetIndex for real this time (#6726)
X-Git-Tag: v3.0.0-alpha~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09ef08acfe52e645dc5866a87d5d8f7e2c32d85c;p=thirdparty%2FChart.js.git

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 43afbc113..e363edd34 100644
--- 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 b46352d9c..29c76c0c9 100644
--- 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 2216753c4..5e811cb4d 100644
--- 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({