From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Tue, 7 Jan 2020 16:27:44 +0000 (+0200)
Subject: Remove futile optimization (#6928)
X-Git-Tag: v3.0.0-alpha~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dd0c2f8feb8eef45e0b077ffa9a648d0c1229c6;p=thirdparty%2FChart.js.git

Remove futile optimization (#6928)
---

diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 70e934afe..cef5098a8 100644
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -125,9 +125,8 @@ module.exports = DatasetController.extend({
 		const firstOpts = me._resolveDataElementOptions(start, mode);
 		const sharedOptions = me._getSharedOptions(mode, points[start], firstOpts);
 		const includeOptions = me._includeOptions(mode, sharedOptions);
-		let i;
 
-		for (i = 0; i < points.length; i++) {
+		for (let i = 0; i < points.length; i++) {
 			const point = points[i];
 			const index = start + i;
 			const parsed = !reset && me._getParsed(index);
@@ -140,8 +139,7 @@ module.exports = DatasetController.extend({
 			};
 
 			if (includeOptions) {
-				properties.options = i === 0 ? firstOpts
-					: me._resolveDataElementOptions(i, mode);
+				properties.options = me._resolveDataElementOptions(i, mode);
 
 				if (reset) {
 					properties.options.radius = 0;
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index d56f04cf3..887585e88 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -98,9 +98,8 @@ module.exports = DatasetController.extend({
 		const firstOpts = me._resolveDataElementOptions(start, mode);
 		const sharedOptions = me._getSharedOptions(mode, points[start], firstOpts);
 		const includeOptions = me._includeOptions(mode, sharedOptions);
-		let i;
 
-		for (i = 0; i < points.length; ++i) {
+		for (let i = 0; i < points.length; ++i) {
 			const index = start + i;
 			const point = points[i];
 			const parsed = me._getParsed(index);
@@ -113,8 +112,7 @@ module.exports = DatasetController.extend({
 			};
 
 			if (includeOptions) {
-				properties.options = i === 0 ? firstOpts
-					: me._resolveDataElementOptions(index, mode);
+				properties.options = me._resolveDataElementOptions(index, mode);
 			}
 
 			me._updateElement(point, index, properties, mode);