@@ -949,10 +949,10 @@ axes.calcTicks = function calcTicks(ax, opts) {
949
949
if ( mockAx . tickmode === 'array' ) {
950
950
if ( major ) {
951
951
tickVals = [ ] ;
952
- ticksOut = arrayTicks ( ax , major ) ;
952
+ ticksOut = arrayTicks ( ax , ! isMinor ) ;
953
953
} else {
954
954
minorTickVals = [ ] ;
955
- minorTicks = arrayTicks ( ax , false ) ;
955
+ minorTicks = arrayTicks ( ax , ! isMinor ) ;
956
956
}
957
957
continue ;
958
958
}
@@ -1261,8 +1261,7 @@ function syncTicks(ax) {
1261
1261
return ticksOut ;
1262
1262
}
1263
1263
1264
- function arrayTicks ( ax , major ) {
1265
- if ( major === undefined ) throw new Error ( 'arrayTicks must specify ticktype' ) ;
1264
+ function arrayTicks ( ax , majorOnly ) {
1266
1265
var rng = Lib . simpleMap ( ax . range , ax . r2l ) ;
1267
1266
var exRng = expandRange ( rng ) ;
1268
1267
var tickMin = Math . min ( exRng [ 0 ] , exRng [ 1 ] ) ;
@@ -1280,11 +1279,10 @@ function arrayTicks(ax, major) {
1280
1279
1281
1280
var ticksOut = [ ] ;
1282
1281
for ( var isMinor = 0 ; isMinor <= 1 ; isMinor ++ ) {
1283
- if ( ! isMinor && ! major ) continue ;
1284
- if ( isMinor && ( ! ax . minor || major ) ) continue ;
1282
+ if ( ( majorOnly !== undefined ) && ( ( majorOnly && isMinor ) || ( majorOnly === false && ! isMinor ) ) ) continue ;
1283
+ if ( isMinor && ! ax . minor ) continue ;
1285
1284
var vals = ! isMinor ? ax . tickvals : ax . minor . tickvals ;
1286
1285
var text = ! isMinor ? ax . ticktext : [ ] ;
1287
-
1288
1286
if ( ! vals ) continue ;
1289
1287
1290
1288
0 commit comments