@@ -949,10 +949,10 @@ axes.calcTicks = function calcTicks(ax, opts) {
949949 if ( mockAx . tickmode === 'array' ) {
950950 if ( major ) {
951951 tickVals = [ ] ;
952- ticksOut = arrayTicks ( ax , major ) ;
952+ ticksOut = arrayTicks ( ax , ! isMinor ) ;
953953 } else {
954954 minorTickVals = [ ] ;
955- minorTicks = arrayTicks ( ax , false ) ;
955+ minorTicks = arrayTicks ( ax , ! isMinor ) ;
956956 }
957957 continue ;
958958 }
@@ -1261,8 +1261,7 @@ function syncTicks(ax) {
12611261 return ticksOut ;
12621262}
12631263
1264- function arrayTicks ( ax , major ) {
1265- if ( major === undefined ) throw new Error ( 'arrayTicks must specify ticktype' ) ;
1264+ function arrayTicks ( ax , majorOnly ) {
12661265 var rng = Lib . simpleMap ( ax . range , ax . r2l ) ;
12671266 var exRng = expandRange ( rng ) ;
12681267 var tickMin = Math . min ( exRng [ 0 ] , exRng [ 1 ] ) ;
@@ -1280,11 +1279,10 @@ function arrayTicks(ax, major) {
12801279
12811280 var ticksOut = [ ] ;
12821281 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 ;
12851284 var vals = ! isMinor ? ax . tickvals : ax . minor . tickvals ;
12861285 var text = ! isMinor ? ax . ticktext : [ ] ;
1287-
12881286 if ( ! vals ) continue ;
12891287
12901288
0 commit comments