File tree Expand file tree Collapse file tree 1 file changed +14
-3
lines changed Expand file tree Collapse file tree 1 file changed +14
-3
lines changed Original file line number Diff line number Diff line change @@ -688,9 +688,20 @@ axes.calcTicks = function calcTicks(ax, opts) {
688
688
return ax . tickformat . indexOf ( str ) !== - 1 ;
689
689
} ;
690
690
691
- if ( _has ( '%d' ) ) definedDelta = ONEDAY ;
692
- else if ( _has ( '%b' ) || _has ( '%m' ) ) definedDelta = ONEAVGMONTH ;
693
- else if ( _has ( '%Y' ) || _has ( '%y' ) ) definedDelta = ONEAVGYEAR ;
691
+ if (
692
+ ! _has ( '%f' ) &&
693
+ ! _has ( '%H' ) &&
694
+ ! _has ( '%I' ) &&
695
+ ! _has ( '%L' ) &&
696
+ ! _has ( '%Q' ) &&
697
+ ! _has ( '%S' ) &&
698
+ ! _has ( '%s' ) &&
699
+ ! _has ( '%X' )
700
+ ) {
701
+ if ( _has ( '%x' ) || _has ( '%d' ) || _has ( '%e' ) || _has ( '%j' ) ) definedDelta = ONEDAY ;
702
+ else if ( _has ( '%B' ) || _has ( '%b' ) || _has ( '%m' ) ) definedDelta = ONEAVGMONTH ;
703
+ else if ( _has ( '%Y' ) || _has ( '%y' ) ) definedDelta = ONEAVGYEAR ;
704
+ }
694
705
}
695
706
696
707
var ticksOut = new Array ( tickVals . length ) ;
You can’t perform that action at this time.
0 commit comments