@@ -2043,9 +2043,7 @@ axes.drawOne = function(gd, ax, opts) {
2043
2043
if ( ! ax . visible ) return ;
2044
2044
2045
2045
var transTickFn = axes . makeTransTickFn ( ax ) ;
2046
- var transTickLabelFn = ax . ticklabelmode === 'period' ?
2047
- axes . makeTransPeriodFn ( ax ) :
2048
- axes . makeTransTickFn ( ax ) ;
2046
+ var transTickLabelFn = axes . makeTransTickLabelFn ( ax ) ;
2049
2047
2050
2048
var tickVals ;
2051
2049
// We remove zero lines, grid lines, and inside ticks if they're within 1px of the end
@@ -2473,15 +2471,19 @@ axes.getTickSigns = function(ax) {
2473
2471
axes . makeTransTickFn = function ( ax ) {
2474
2472
var axLetter = ax . _id . charAt ( 0 ) ;
2475
2473
var offset = ax . _offset ;
2474
+
2476
2475
return axLetter === 'x' ?
2477
2476
function ( d ) { return strTranslate ( offset + ax . l2p ( d . x ) , 0 ) ; } :
2478
2477
function ( d ) { return strTranslate ( 0 , offset + ax . l2p ( d . x ) ) ; } ;
2479
2478
} ;
2480
2479
2481
- axes . makeTransPeriodFn = function ( ax ) {
2480
+ axes . makeTransTickLabelFn = function ( ax ) {
2482
2481
var axLetter = ax . _id . charAt ( 0 ) ;
2483
2482
var offset = ax . _offset ;
2484
- return axLetter === 'x' ?
2483
+ var isX = axLetter === 'x' ;
2484
+
2485
+ if ( ax . ticklabelmode === 'period' ) {
2486
+ return isX ?
2485
2487
function ( d ) {
2486
2488
return strTranslate (
2487
2489
offset + ax . l2p ( getPeriodX ( d ) ) ,
@@ -2494,6 +2496,9 @@ axes.makeTransPeriodFn = function(ax) {
2494
2496
offset + ax . l2p ( getPeriodX ( d ) )
2495
2497
) ;
2496
2498
} ;
2499
+ }
2500
+
2501
+ return axes . makeTransTickFn ( ax ) ;
2497
2502
} ;
2498
2503
2499
2504
function getPeriodX ( d ) {
0 commit comments