From ea4ad325d922ece11e4392ddbf56125b46f09b79 Mon Sep 17 00:00:00 2001 From: CK Date: Sat, 22 Dec 2018 22:43:02 -0800 Subject: [PATCH 1/3] Fix #5935 --- src/scales/scale.time.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index a2892bfd6cd..213f63b1104 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -531,7 +531,7 @@ module.exports = function() { var timestamps = []; var datasets = []; var labels = []; - var i, j, ilen, jlen, data, timestamp; + var i, j, k, ilen, jlen, data, timestamp; var dataLabels = chart.data.labels || []; // Convert labels to timestamps @@ -554,7 +554,9 @@ module.exports = function() { datasets[i][j] = timestamp; } } else { - timestamps.push.apply(timestamps, labels); + for (k = 0; k < labels.length; ++k) { + timestamps.push(labels[k]); + } datasets[i] = labels.slice(0); } } else { From 01a4c2532a0c0f6dfaaee0e6478a469fd888ce4f Mon Sep 17 00:00:00 2001 From: CK Date: Wed, 26 Dec 2018 09:05:31 -0800 Subject: [PATCH 2/3] Reuse variable j --- src/scales/scale.time.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 213f63b1104..28ec0b1fad3 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -531,7 +531,7 @@ module.exports = function() { var timestamps = []; var datasets = []; var labels = []; - var i, j, k, ilen, jlen, data, timestamp; + var i, j, ilen, jlen, data, timestamp; var dataLabels = chart.data.labels || []; // Convert labels to timestamps @@ -554,8 +554,8 @@ module.exports = function() { datasets[i][j] = timestamp; } } else { - for (k = 0; k < labels.length; ++k) { - timestamps.push(labels[k]); + for (j = 0; j < labels.length; ++j) { + timestamps.push(labels[j]); } datasets[i] = labels.slice(0); } From 5e725e0efe79604b024b466d86c93a85e87ebe08 Mon Sep 17 00:00:00 2001 From: CK Date: Fri, 28 Dec 2018 11:35:46 -0800 Subject: [PATCH 3/3] Cache labels.length --- src/scales/scale.time.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 28ec0b1fad3..099e5717e9a 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -554,7 +554,7 @@ module.exports = function() { datasets[i][j] = timestamp; } } else { - for (j = 0; j < labels.length; ++j) { + for (j = 0, jlen = labels.length; j < jlen; ++j) { timestamps.push(labels[j]); } datasets[i] = labels.slice(0);