Skip to content

Commit

Permalink
Ensure that when the time axis accesses data.labels it actually exi…
Browse files Browse the repository at this point in the history
…sts (#5750)
  • Loading branch information
etimberg authored and simonbrunel committed Oct 18, 2018
1 parent dfbb574 commit f815dd5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/scales/scale.time.js
Expand Up @@ -534,10 +534,11 @@ module.exports = function() {
var datasets = [];
var labels = [];
var i, j, ilen, jlen, data, timestamp;
var dataLabels = chart.data.labels || [];

// Convert labels to timestamps
for (i = 0, ilen = chart.data.labels.length; i < ilen; ++i) {
labels.push(parse(chart.data.labels[i], me));
for (i = 0, ilen = dataLabels.length; i < ilen; ++i) {
labels.push(parse(dataLabels[i], me));
}

// Convert data to timestamps
Expand Down

0 comments on commit f815dd5

Please sign in to comment.