Remove unnecessary method argument (#6878)

Remove unnecessary method argument

diff --git a/docs/getting-started/v3-migration.md b/docs/getting-started/v3-migration.md
index a46a658d2189de7e23644a1b361610dadda56ed8..379863d8009d7489c820a303fcda88a4e7212a61 100644 (file)
--- a/docs/getting-started/v3-migration.md
+++ b/docs/getting-started/v3-migration.md
@@ -106,7 +106,6 @@ Animation system was completely rewritten in Chart.js v3. Each property can now
 
 * `Chart.Animation.animationObject` was renamed to `Chart.Animation`
 * `Chart.Animation.chartInstance` was renamed to `Chart.Animation.chart`
-* `DatasetController.updateElement` was renamed to `DatasetController.updateElements`
 * `helpers._decimalPlaces` was renamed to `helpers.math._decimalPlaces`
 * `helpers.almostEquals` was renamed to `helpers.math.almostEquals`
 * `helpers.almostWhole` was renamed to `helpers.math.almostWhole`
@@ -168,6 +167,7 @@ Animation system was completely rewritten in Chart.js v3. Each property can now
 
 ##### Dataset Controllers
 
+* `updateElement` was replaced with `updateElements` now taking the elements to update, the `start` index, and `mode`
 * `setHoverStyle` and `removeHoverStyle` now additionally take the `datasetIndex` and `index`
 
 #### Interactions

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 5f7054fbcef046a61aefd15890190634137d998d..3136d6eb0de84a1646714ab8f1058ce72d51525b 100644 (file)
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -277,10 +277,10 @@ module.exports = DatasetController.extend({
                const me = this;
                const rects = me._cachedMeta.data;
 
-               me.updateElements(rects, 0, rects.length, mode);
+               me.updateElements(rects, 0, mode);
        },
 
-       updateElements: function(rectangles, start, count, mode) {
+       updateElements: function(rectangles, start, mode) {
                const me = this;
                const reset = mode === 'reset';
                const vscale = me._cachedMeta.vScale;
@@ -293,10 +293,11 @@ module.exports = DatasetController.extend({
 
                let i;
 
-               for (i = 0; i < start + count; i++) {
-                       const options = me._resolveDataElementOptions(i, mode);
-                       const vpixels = me.calculateBarValuePixels(i, options);
-                       const ipixels = me.calculateBarIndexPixels(i, ruler, options);
+               for (i = 0; i < rectangles.length; i++) {
+                       const index = start + i;
+                       const options = me._resolveDataElementOptions(index, mode);
+                       const vpixels = me.calculateBarValuePixels(index, options);
+                       const ipixels = me.calculateBarIndexPixels(index, ruler, options);
 
                        const properties = {
                                horizontal,
@@ -316,7 +317,7 @@ module.exports = DatasetController.extend({
                        if (includeOptions) {
                                properties.options = options;
                        }
-                       me._updateElement(rectangles[i], i, properties, mode);
+                       me._updateElement(rectangles[i], index, properties, mode);
                }
 
                me._updateSharedOptions(sharedOptions, mode);

diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 21cacfb78489878014ef4ee38a7fcef1e83abe8e..efb453bce490b3769d0b072cc7b184acc96219d5 100644 (file)
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -114,13 +114,13 @@ module.exports = DatasetController.extend({
                const points = me._cachedMeta.data;
 
                // Update Points
-               me.updateElements(points, 0, points.length, mode);
+               me.updateElements(points, 0, mode);
        },
 
        /**
         * @protected
         */
-       updateElements: function(points, start, count, mode) {
+       updateElements: function(points, start, mode) {
                const me = this;
                const reset = mode === 'reset';
                const {xScale, yScale} = me._cachedMeta;
@@ -129,9 +129,10 @@ module.exports = DatasetController.extend({
                const includeOptions = me._includeOptions(mode, sharedOptions);
                let i;
 
-               for (i = start; i < start + count; i++) {
+               for (i = 0; i < points.length; i++) {
                        const point = points[i];
-                       const parsed = !reset && me._getParsed(i);
+                       const index = start + i;
+                       const parsed = !reset && me._getParsed(index);
                        const x = reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(parsed[xScale.id]);
                        const y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(parsed[yScale.id]);
                        const properties = {
@@ -141,7 +142,7 @@ module.exports = DatasetController.extend({
                        };
 
                        if (includeOptions) {
-                               properties.options = i === start ? firstOpts
+                               properties.options = i === 0 ? firstOpts
                                        : me._resolveDataElementOptions(i, mode);
 
                                if (reset) {
@@ -149,7 +150,7 @@ module.exports = DatasetController.extend({
                                }
                        }
 
-                       me._updateElement(point, i, properties, mode);
+                       me._updateElement(point, index, properties, mode);
                }
 
                me._updateSharedOptions(sharedOptions, mode);

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 954c2ec792c67cf3d69c0eddc33a597647bc1213..49a7f843b1abc71b0c6ac5f739aa11e3780aa19c 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -221,10 +221,20 @@ module.exports = DatasetController.extend({
                me.outerRadius = chart.outerRadius - chart.radiusLength * me._getRingWeightOffset(me.index);
                me.innerRadius = Math.max(me.outerRadius - chart.radiusLength * chartWeight, 0);
 
-               me.updateElements(arcs, 0, arcs.length, mode);
+               me.updateElements(arcs, 0, mode);
        },
 
-       updateElements: function(arcs, start, count, mode) {
+       /**
+        * @private
+        */
+       _circumference: function(i, reset) {
+               const me = this;
+               const opts = me.chart.options;
+               const meta = me._cachedMeta;
+               return reset && opts.animation.animateRotate ? 0 : meta.data[i].hidden ? 0 : me.calculateCircumference(meta._parsed[i] * opts.circumference / DOUBLE_PI);
+       },
+
+       updateElements: function(arcs, start, mode) {
                const me = this;
                const reset = mode === 'reset';
                const chart = me.chart;
@@ -233,20 +243,20 @@ module.exports = DatasetController.extend({
                const animationOpts = opts.animation;
                const centerX = (chartArea.left + chartArea.right) / 2;
                const centerY = (chartArea.top + chartArea.bottom) / 2;
-               const meta = me.getMeta();
                const innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius;
                const outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius;
                let startAngle = opts.rotation;
                let i;
 
-               for (i = 0; i < start + count; ++i) {
+               for (i = 0; i < start; ++i) {
+                       startAngle += me._circumference(i, reset);
+               }
+
+               for (i = 0; i < arcs.length; ++i) {
+                       const index = start + i;
+                       const circumference = me._circumference(index, reset);
                        const arc = arcs[i];
-                       const circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(meta._parsed[i] * opts.circumference / DOUBLE_PI);
                        const options = arc._options || {};
-                       if (i < start) {
-                               startAngle += circumference;
-                               continue;
-                       }
                        const properties = {
                                x: centerX + chart.offsetX,
                                y: centerY + chart.offsetY,
@@ -259,7 +269,7 @@ module.exports = DatasetController.extend({
                        };
                        startAngle += circumference;
 
-                       me._updateElement(arc, i, properties, mode);
+                       me._updateElement(arc, index, properties, mode);
                }
        },
 

diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 0e53171099a88f175235e2eb779ff617eff50f44..9713d3b5d38d8ef43061af52efdfe4e44891485f 100644 (file)
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -88,11 +88,11 @@ module.exports = DatasetController.extend({
 
                // Update Points
                if (meta.visible) {
-                       me.updateElements(points, 0, points.length, mode);
+                       me.updateElements(points, 0, mode);
                }
        },
 
-       updateElements: function(points, start, count, mode) {
+       updateElements: function(points, start, mode) {
                const me = this;
                const reset = mode === 'reset';
                const {xScale, yScale, _stacked} = me._cachedMeta;
@@ -101,9 +101,10 @@ module.exports = DatasetController.extend({
                const includeOptions = me._includeOptions(mode, sharedOptions);
                let i;
 
-               for (i = start; i < start + count; ++i) {
+               for (i = 0; i < points.length; ++i) {
+                       const index = start + i;
                        const point = points[i];
-                       const parsed = me._getParsed(i);
+                       const parsed = me._getParsed(index);
                        const x = xScale.getPixelForValue(parsed[xScale.id]);
                        const y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(_stacked ? me._applyStack(yScale, parsed) : parsed[yScale.id]);
                        const properties = {
@@ -113,11 +114,11 @@ module.exports = DatasetController.extend({
                        };
 
                        if (includeOptions) {
-                               properties.options = i === start ? firstOpts
-                                       : me._resolveDataElementOptions(i, mode);
+                               properties.options = i === 0 ? firstOpts
+                                       : me._resolveDataElementOptions(index, mode);
                        }
 
-                       me._updateElement(point, i, properties, mode);
+                       me._updateElement(point, index, properties, mode);
                }
 
                me._updateSharedOptions(sharedOptions, mode);

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index c472783894949ac6cc0e02a523fea7e5b1838914..518b8d3d5572b72e70eecf7ca1c9a21f9e5eb4c0 100644 (file)
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -144,7 +144,7 @@ module.exports = DatasetController.extend({
 
                me._updateRadius();
 
-               me.updateElements(arcs, 0, arcs.length, mode);
+               me.updateElements(arcs, 0, mode);
        },
 
        /**
@@ -165,7 +165,7 @@ module.exports = DatasetController.extend({
                me.innerRadius = me.outerRadius - chart.radiusLength;
        },
 
-       updateElements: function(arcs, start, count, mode) {
+       updateElements: function(arcs, start, mode) {
                const me = this;
                const reset = mode === 'reset';
                const chart = me.chart;
@@ -184,11 +184,12 @@ module.exports = DatasetController.extend({
                for (i = 0; i < start; ++i) {
                        angle += me._computeAngle(i);
                }
-               for (; i < start + count; i++) {
+               for (i = 0; i < arcs.length; i++) {
                        const arc = arcs[i];
+                       const index = start + i;
                        let startAngle = angle;
-                       let endAngle = angle + me._computeAngle(i);
-                       let outerRadius = arc.hidden ? 0 : scale.getDistanceFromCenterForValue(dataset.data[i]);
+                       let endAngle = angle + me._computeAngle(index);
+                       let outerRadius = arc.hidden ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
                        angle = endAngle;
 
                        if (reset) {
@@ -208,10 +209,10 @@ module.exports = DatasetController.extend({
                                outerRadius,
                                startAngle,
                                endAngle,
-                               options: me._resolveDataElementOptions(i)
+                               options: me._resolveDataElementOptions(index)
                        };
 
-                       me._updateElement(arc, i, properties, mode);
+                       me._updateElement(arc, index, properties, mode);
                }
        },
 

diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 9f3ae118e58ecc391ebe3d2ec29c82c655e485bf..617677ce2f84228101c55a8a4373de81f1f9b4ba 100644 (file)
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -86,10 +86,10 @@ module.exports = DatasetController.extend({
        },
 
        update: function(mode) {
-               var me = this;
-               var meta = me._cachedMeta;
-               var line = meta.dataset;
-               var points = meta.data || [];
+               const me = this;
+               const meta = me._cachedMeta;
+               const line = meta.dataset;
+               const points = meta.data || [];
 
                const properties = {
                        _children: points,
@@ -100,22 +100,23 @@ module.exports = DatasetController.extend({
                me._updateElement(line, undefined, properties, mode);
 
                // Update Points
-               me.updateElements(points, 0, points.length, mode);
+               me.updateElements(points, 0, mode);
 
                line.updateControlPoints(me.chart.chartArea);
        },
 
-       updateElements: function(points, start, count, mode) {
+       updateElements: function(points, start, mode) {
                const me = this;
                const dataset = me.getDataset();
                const scale = me.chart.scales.r;
                const reset = mode === 'reset';
-               var i;
+               let i;
 
-               for (i = start; i < start + count; i++) {
+               for (i = 0; i < points.length; i++) {
                        const point = points[i];
-                       const options = me._resolveDataElementOptions(i);
-                       const pointPosition = scale.getPointPositionForValue(i, dataset.data[i]);
+                       const index = start + i;
+                       const options = me._resolveDataElementOptions(index);
+                       const pointPosition = scale.getPointPositionForValue(index, dataset.data[index]);
 
                        const x = reset ? scale.xCenter : pointPosition.x;
                        const y = reset ? scale.yCenter : pointPosition.y;
@@ -127,7 +128,7 @@ module.exports = DatasetController.extend({
                                options,
                        };
 
-                       me._updateElement(point, i, properties, mode);
+                       me._updateElement(point, index, properties, mode);
                }
        },
 
@@ -135,10 +136,10 @@ module.exports = DatasetController.extend({
         * @private
         */
        _resolveDatasetElementOptions: function() {
-               var me = this;
-               var config = me._config;
-               var options = me.chart.options;
-               var values = DatasetController.prototype._resolveDatasetElementOptions.apply(me, arguments);
+               const me = this;
+               const config = me._config;
+               const options = me.chart.options;
+               const values = DatasetController.prototype._resolveDatasetElementOptions.apply(me, arguments);
 
                values.spanGaps = valueOrDefault(config.spanGaps, options.spanGaps);
                values.tension = valueOrDefault(config.lineTension, options.elements.line.tension);

diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index 3a818477d1bf0fa7db8582c50927393e5f18c50b..a79cf1f569eb399f974cf9eea3bb0f43334793c5 100644 (file)
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -1063,7 +1063,7 @@ helpers.extend(DatasetController.prototype, {
                }
                me._parse(start, count);
 
-               me.updateElements(data, start, count, 'reset');
+               me.updateElements(elements, start, 'reset');
        },
 
        /**