Remove futile optimization (#6928)

diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 70e934afea0d04669b3874eb335de0f8c8c257c2..cef5098a8d2620bbfe0a3b7ea2cdde8807acd52d 100644 (file)
--- 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 d56f04cf35818a5360d1885034565a34d059e51c..887585e885faa8f136d4512b26634844f54a59da 100644 (file)
--- 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);