Skip to content

Commit 3b0b502

Browse files
benmccannbenmccann
committed
[performance] replace helpers.each calls with for-loops
1 parent 70b32ff commit 3b0b502

File tree

3 files changed

+62
-53
lines changed

3 files changed

+62
-53
lines changed

‎src/core/core.helpers.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -553,25 +553,30 @@ module.exports = function() {
553553

554554
ctx.font = font;
555555
var longest = 0;
556-
helpers.each(arrayOfThings, function(thing) {
556+
var ilen = arrayOfThings.length;
557+
var i, j, jlen, thing, nestedThing;
558+
for (i = 0; i < ilen; i++) {
559+
thing = arrayOfThings[i];
560+
557561
// Undefined strings and arrays should not be measured
558562
if (thing !== undefined && thing !== null && helpers.isArray(thing) !== true) {
559563
longest = helpers.measureText(ctx, data, gc, longest, thing);
560564
} else if (helpers.isArray(thing)) {
561565
// if it is an array lets measure each element
562566
// to do maybe simplify this function a bit so we can do this more recursively?
563-
helpers.each(thing, function(nestedThing) {
567+
for (j = 0, jlen = thing.length; j < jlen; j++) {
568+
nestedThing = thing[j];
564569
// Undefined strings and arrays should not be measured
565570
if (nestedThing !== undefined && nestedThing !== null && !helpers.isArray(nestedThing)) {
566571
longest = helpers.measureText(ctx, data, gc, longest, nestedThing);
567572
}
568-
});
573+
}
569574
}
570-
});
575+
}
571576

572577
var gcLen = gc.length / 2;
573578
if (gcLen > arrayOfThings.length) {
574-
for (var i = 0; i < gcLen; i++) {
579+
for (i = 0; i < gcLen; i++) {
575580
delete data[gc[i]];
576581
}
577582
gc.splice(0, gcLen);
@@ -589,6 +594,10 @@ module.exports = function() {
589594
}
590595
return longest;
591596
};
597+
598+
/**
599+
* @deprecated
600+
*/
592601
helpers.numberOfLabelLines = function(arrayOfThings) {
593602
var numberOfLines = 1;
594603
helpers.each(arrayOfThings, function(thing) {

‎src/scales/scale.linear.js

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ module.exports = LinearScaleBase.extend({
1616
var me = this;
1717
var opts = me.options;
1818
var chart = me.chart;
19-
var data = chart.data;
20-
var datasets = data.datasets;
19+
var datasets = chart.data.datasets;
2120
var isHorizontal = me.isHorizontal();
2221
var DEFAULT_MIN = 0;
2322
var DEFAULT_MAX = 1;
23+
var datasetIndex, meta, value, data, i, ilen;
2424

25-
function IDMatches(meta) {
26-
return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
25+
function IDMatches(scaleMeta) {
26+
return isHorizontal ? scaleMeta.xAxisID === me.id : scaleMeta.yAxisID === me.id;
2727
}
2828

2929
// First Calculate the range
@@ -32,24 +32,20 @@ module.exports = LinearScaleBase.extend({
3232

3333
var hasStacks = opts.stacked;
3434
if (hasStacks === undefined) {
35-
helpers.each(datasets, function(dataset, datasetIndex) {
36-
if (hasStacks) {
37-
return;
38-
}
39-
40-
var meta = chart.getDatasetMeta(datasetIndex);
41-
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
42-
meta.stack !== undefined) {
35+
for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
36+
meta = chart.getDatasetMeta(datasetIndex);
37+
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) && meta.stack !== undefined) {
4338
hasStacks = true;
39+
break;
4440
}
45-
});
41+
}
4642
}
4743

4844
if (opts.stacked || hasStacks) {
4945
var valuesPerStack = {};
5046

51-
helpers.each(datasets, function(dataset, datasetIndex) {
52-
var meta = chart.getDatasetMeta(datasetIndex);
47+
for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
48+
meta = chart.getDatasetMeta(datasetIndex);
5349
var key = [
5450
meta.type,
5551
// we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
@@ -69,30 +65,31 @@ module.exports = LinearScaleBase.extend({
6965
var negativeValues = valuesPerStack[key].negativeValues;
7066

7167
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
72-
helpers.each(dataset.data, function(rawValue, index) {
73-
var value = me._parseValue(rawValue);
68+
data = datasets[datasetIndex].data;
69+
for (i = 0, ilen = data.length; i < ilen; i++) {
70+
value = me._parseValue(data[i]);
7471

75-
if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden) {
76-
return;
72+
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
73+
continue;
7774
}
7875

79-
positiveValues[index] = positiveValues[index] || 0;
80-
negativeValues[index] = negativeValues[index] || 0;
76+
positiveValues[i] = positiveValues[i] || 0;
77+
negativeValues[i] = negativeValues[i] || 0;
8178

8279
if (value.min === 0 && !opts.ticks.beginAtZero) {
8380
value.min = value.max;
8481
}
8582

8683
if (opts.relativePoints) {
87-
positiveValues[index] = 100;
84+
positiveValues[i] = 100;
8885
} else if (value.min < 0 || value.max < 0) {
89-
negativeValues[index] += value.min;
86+
negativeValues[i] += value.min;
9087
} else {
91-
positiveValues[index] += value.max;
88+
positiveValues[i] += value.max;
9289
}
93-
});
90+
}
9491
}
95-
});
92+
}
9693

9794
helpers.each(valuesPerStack, function(valuesForType) {
9895
var values = valuesForType.positiveValues.concat(valuesForType.negativeValues);
@@ -103,14 +100,15 @@ module.exports = LinearScaleBase.extend({
103100
});
104101

105102
} else {
106-
helpers.each(datasets, function(dataset, datasetIndex) {
107-
var meta = chart.getDatasetMeta(datasetIndex);
103+
for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
104+
meta = chart.getDatasetMeta(datasetIndex);
108105
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
109-
helpers.each(dataset.data, function(rawValue, index) {
110-
var value = me._parseValue(rawValue);
106+
data = datasets[datasetIndex].data;
107+
for (i = 0, ilen = data.length; i < ilen; i++) {
108+
value = me._parseValue(data[i]);
111109

112-
if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden) {
113-
return;
110+
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
111+
continue;
114112
}
115113

116114
if (me.min === null || value.min < me.min) {
@@ -120,9 +118,9 @@ module.exports = LinearScaleBase.extend({
120118
if (me.max === null || me.max < value.max) {
121119
me.max = value.max;
122120
}
123-
});
121+
}
124122
}
125-
});
123+
}
126124
}
127125

128126
me.min = isFinite(me.min) && !isNaN(me.min) ? me.min : DEFAULT_MIN;

‎src/scales/scale.logarithmic.js

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ module.exports = Scale.extend({
7272
var me = this;
7373
var opts = me.options;
7474
var chart = me.chart;
75-
var data = chart.data;
76-
var datasets = data.datasets;
75+
var datasets = chart.data.datasets;
7776
var isHorizontal = me.isHorizontal();
7877
function IDMatches(meta) {
7978
return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
8079
}
80+
var i, ilen, data;
8181

8282
// Calculate Range
8383
me.min = null;
@@ -116,16 +116,17 @@ module.exports = Scale.extend({
116116
valuesPerStack[key] = [];
117117
}
118118

119-
helpers.each(dataset.data, function(rawValue, index) {
119+
data = dataset.data;
120+
for (i = 0, ilen = data.length; i < ilen; i++) {
120121
var values = valuesPerStack[key];
121-
var value = me._parseValue(rawValue);
122+
var value = me._parseValue(data[i]);
122123
// invalid, hidden and negative values are ignored
123-
if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden || value.min < 0 || value.max < 0) {
124-
return;
124+
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
125+
continue;
125126
}
126-
values[index] = values[index] || 0;
127-
values[index] += value.max;
128-
});
127+
values[i] = values[i] || 0;
128+
values[i] += value.max;
129+
}
129130
}
130131
});
131132

@@ -142,11 +143,12 @@ module.exports = Scale.extend({
142143
helpers.each(datasets, function(dataset, datasetIndex) {
143144
var meta = chart.getDatasetMeta(datasetIndex);
144145
if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
145-
helpers.each(dataset.data, function(rawValue, index) {
146-
var value = me._parseValue(rawValue);
146+
data = dataset.data;
147+
for (i = 0, ilen = data.length; i < ilen; i++) {
148+
var value = me._parseValue(data[i]);
147149
// invalid, hidden and negative values are ignored
148-
if (isNaN(value.min) || isNaN(value.max) || meta.data[index].hidden || value.min < 0 || value.max < 0) {
149-
return;
150+
if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
151+
continue;
150152
}
151153

152154
if (me.min === null || value.min < me.min) {
@@ -160,7 +162,7 @@ module.exports = Scale.extend({
160162
if (value.min !== 0 && (me.minNotZero === null || value.min < me.minNotZero)) {
161163
me.minNotZero = value.min;
162164
}
163-
});
165+
}
164166
}
165167
});
166168
}

0 commit comments

Comments
 (0)