@@ -534,18 +534,18 @@ module.exports = Scale.extend({
534
534
var unit = options . time . unit || 'day' ;
535
535
var min = MAX_INTEGER ;
536
536
var max = MIN_INTEGER ;
537
+ var timestamps = [ ] ;
537
538
var datasets = [ ] ;
538
539
var labels = [ ] ;
539
- var timestamps , i , j , ilen , jlen , data , timestamp ;
540
+ var i , j , ilen , jlen , data , timestamp , labelsAdded ;
540
541
var dataLabels = me . _getLabels ( ) ;
541
542
542
- // Convert labels to timestamps
543
+ // Set labels
543
544
for ( i = 0 , ilen = dataLabels . length ; i < ilen ; ++ i ) {
544
545
labels . push ( parse ( me , dataLabels [ i ] ) ) ;
545
546
}
546
- timestamps = labels . slice ( 0 ) ;
547
547
548
- // Convert data to timestamps
548
+ // Set timestamps
549
549
for ( i = 0 , ilen = ( chart . data . datasets || [ ] ) . length ; i < ilen ; ++ i ) {
550
550
if ( chart . isDatasetVisible ( i ) ) {
551
551
data = chart . data . datasets [ i ] . data ;
@@ -561,6 +561,10 @@ module.exports = Scale.extend({
561
561
}
562
562
} else {
563
563
datasets [ i ] = labels . slice ( 0 ) ;
564
+ if ( ! labelsAdded ) {
565
+ timestamps = timestamps . concat ( labels ) ;
566
+ labelsAdded = true ;
567
+ }
564
568
}
565
569
} else {
566
570
datasets [ i ] = [ ] ;
@@ -573,7 +577,9 @@ module.exports = Scale.extend({
573
577
}
574
578
575
579
if ( timestamps . length ) {
576
- timestamps = arrayUnique ( timestamps ) . sort ( sorter ) ;
580
+ if ( ilen > 1 ) {
581
+ timestamps = arrayUnique ( timestamps ) . sort ( sorter ) ;
582
+ }
577
583
min = Math . min ( min , timestamps [ 0 ] ) ;
578
584
max = Math . max ( max , timestamps [ timestamps . length - 1 ] ) ;
579
585
}
0 commit comments