archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Ensure that when the time axis accesses data.labels it actually exists (#5750)

Browse Source
This commit is contained in:
Evert Timberg 2018-10-18 15:28:49 -04:00 committed by Simon Brunel
parent dfbb57468f
commit f815dd5196
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/scales/scale.time.js
View File

@ -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