Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-06 12:19:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove a couple calls to helpers.each (#6594)

Browse Source
This commit is contained in:
Ben McCann 2019-10-25 04:14:07 -07:00 committed by Evert Timberg
parent f606c23f2f
commit 4d7fefcdb6
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/core.controller.js
View File

@ -417,21 +417,24 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
buildOrUpdateControllers: function() { buildOrUpdateControllers: function() {
var me = this; var me = this;
var newControllers = []; var newControllers = [];
var datasets = me.data.datasets;
var i, ilen;
helpers.each(me.data.datasets, function(dataset, datasetIndex) { for (i = 0, ilen = datasets.length; i < ilen; i++) {
var meta = me.getDatasetMeta(datasetIndex); var dataset = datasets[i];
var meta = me.getDatasetMeta(i);
var type = dataset.type || me.config.type; var type = dataset.type || me.config.type;
if (meta.type && meta.type !== type) { if (meta.type && meta.type !== type) {
me.destroyDatasetMeta(datasetIndex); me.destroyDatasetMeta(i);
meta = me.getDatasetMeta(datasetIndex); meta = me.getDatasetMeta(i);
} }
meta.type = type; meta.type = type;
meta.order = dataset.order || 0; meta.order = dataset.order || 0;
meta.index = datasetIndex; meta.index = i;
if (meta.controller) { if (meta.controller) {
meta.controller.updateIndex(datasetIndex); meta.controller.updateIndex(i);
meta.controller.linkScales(); meta.controller.linkScales();
} else { } else {
var ControllerClass = controllers[meta.type]; 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.'); 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); newControllers.push(meta.controller);
} }
}, me); }
return newControllers; return newControllers;
}, },
@ -468,6 +471,7 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
update: function(config) { update: function(config) {
var me = this; var me = this;
var i, ilen;
if (!config || typeof config !== 'object') { if (!config || typeof config !== 'object') {
// backwards compatibility // backwards compatibility
@ -494,9 +498,9 @@ helpers.extend(Chart.prototype, /** @lends Chart */ {
var newControllers = me.buildOrUpdateControllers(); var newControllers = me.buildOrUpdateControllers();
// Make sure all dataset controllers have correct meta data counts // Make sure all dataset controllers have correct meta data counts
helpers.each(me.data.datasets, function(dataset, datasetIndex) { for (i = 0, ilen = me.data.datasets.length; i < ilen; i++) {
me.getDatasetMeta(datasetIndex).controller.buildOrUpdateElements(); me.getDatasetMeta(i).controller.buildOrUpdateElements();
}, me); }
me.updateLayout(); me.updateLayout();