]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Remove a couple calls to helpers.each (#6594)
authorBen McCann <322311+benmccann@users.noreply.github.com>
Fri, 25 Oct 2019 11:14:07 +0000 (04:14 -0700)
committerEvert Timberg <evert.timberg+github@gmail.com>
Fri, 25 Oct 2019 11:14:07 +0000 (07:14 -0400)
src/core/core.controller.js

index 46b356e68205810917b7e9f1b33fcf71dd9cd423..32413c3b8ad5d3e6914dabfbed9bec3475632bf2 100644 (file)
@@ -417,21 +417,24 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
        buildOrUpdateControllers: function() {
                var me = this;
                var newControllers = [];
+               var datasets = me.data.datasets;
+               var i, ilen;
 
-               helpers.each(me.data.datasets, function(dataset, datasetIndex) {
-                       var meta = me.getDatasetMeta(datasetIndex);
+               for (i = 0, ilen = datasets.length; i < ilen; i++) {
+                       var dataset = datasets[i];
+                       var meta = me.getDatasetMeta(i);
                        var type = dataset.type || me.config.type;
 
                        if (meta.type && meta.type !== type) {
-                               me.destroyDatasetMeta(datasetIndex);
-                               meta = me.getDatasetMeta(datasetIndex);
+                               me.destroyDatasetMeta(i);
+                               meta = me.getDatasetMeta(i);
                        }
                        meta.type = type;
                        meta.order = dataset.order || 0;
-                       meta.index = datasetIndex;
+                       meta.index = i;
 
                        if (meta.controller) {
-                               meta.controller.updateIndex(datasetIndex);
+                               meta.controller.updateIndex(i);
                                meta.controller.linkScales();
                        } else {
                                var ControllerClass = controllers[meta.type];
@@ -439,10 +442,10 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
                                        throw new Error('"' + meta.type + '" is not a chart type.');
                                }
 
-                               meta.controller = new ControllerClass(me, datasetIndex);
+                               meta.controller = new ControllerClass(me, i);
                                newControllers.push(meta.controller);
                        }
-               }, me);
+               }
 
                return newControllers;
        },
@@ -468,6 +471,7 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
 
        update: function(config) {
                var me = this;
+               var i, ilen;
 
                if (!config || typeof config !== 'object') {
                        // backwards compatibility
@@ -494,9 +498,9 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
                var newControllers = me.buildOrUpdateControllers();
 
                // Make sure all dataset controllers have correct meta data counts
-               helpers.each(me.data.datasets, function(dataset, datasetIndex) {
-                       me.getDatasetMeta(datasetIndex).controller.buildOrUpdateElements();
-               }, me);
+               for (i = 0, ilen = me.data.datasets.length; i < ilen; i++) {
+                       me.getDatasetMeta(i).controller.buildOrUpdateElements();
+               }
 
                me.updateLayout();