@@ -408,9 +408,8 @@ function computeOffsets(table, ticks, min, max, options) {
408
408
return { start : start , end : end } ;
409
409
}
410
410
411
- function ticksFromTimestamps ( scale , values ) {
411
+ function ticksFromTimestamps ( scale , values , majorUnit ) {
412
412
var ticks = [ ] ;
413
- var majorUnit = scale . _majorUnit ;
414
413
var i , ilen , value , major ;
415
414
416
415
for ( i = 0 , ilen = values . length ; i < ilen ; ++ i ) {
@@ -642,7 +641,7 @@ module.exports = Scale.extend({
642
641
ticks . reverse ( ) ;
643
642
}
644
643
645
- return ticksFromTimestamps ( me , ticks ) ;
644
+ return ticksFromTimestamps ( me , ticks , me . _majorUnit ) ;
646
645
} ,
647
646
648
647
getLabelForIndex : function ( index , datasetIndex ) {
@@ -677,11 +676,10 @@ module.exports = Scale.extend({
677
676
var minorFormat = formats [ me . _unit ] ;
678
677
var majorUnit = me . _majorUnit ;
679
678
var majorFormat = formats [ majorUnit ] ;
680
- var tick = ! isNaN ( index ) && ticks [ index ] ;
681
- var isMajorTime = tick && tick . major ;
679
+ var tick = ticks [ index ] ;
682
680
var tickOpts = options . ticks ;
683
681
var majorTickOpts = tickOpts . major ;
684
- var major = majorTickOpts . enabled && majorUnit && majorFormat && isMajorTime ;
682
+ var major = majorTickOpts . enabled && majorUnit && majorFormat && tick && tick . major ;
685
683
var label = adapter . format ( time , format ? format : major ? majorFormat : minorFormat ) ;
686
684
var nestedTickOpts = major ? majorTickOpts : tickOpts . minor ;
687
685
var formatter = helpers . options . resolve ( [
@@ -782,7 +780,7 @@ module.exports = Scale.extend({
782
780
// pick the longest format (milliseconds) for guestimation
783
781
var format = displayFormats [ timeOpts . unit ] || displayFormats . millisecond ;
784
782
785
- var exampleLabel = me . tickFormatFunction ( exampleTime , 0 , ticksFromTimestamps ( me , [ exampleTime ] ) , format ) ;
783
+ var exampleLabel = me . tickFormatFunction ( exampleTime , 0 , ticksFromTimestamps ( me , [ exampleTime ] , me . _majorUnit ) , format ) ;
786
784
var tickLabelWidth = me . getLabelWidth ( exampleLabel ) ;
787
785
788
786
// Using margins instead of padding because padding is not calculated
0 commit comments