@@ -12,34 +12,31 @@ var constants = require('./constants');
1212var HOUR = constants . HOUR_PATTERN ;
1313var DAY_OF_WEEK = constants . WEEKDAY_PATTERN ;
1414
15- function makeTickmode ( minor ) {
16- var values = [ 'auto' , 'linear' , 'array' , 'sync' ] ;
17- var description = [
15+ var minorTickmode = {
16+ valType : 'enumerated' ,
17+ values : [ 'auto' , 'linear' , 'array' ] ,
18+ editType : 'ticks' ,
19+ impliedEdits : { tick0 : undefined , dtick : undefined } ,
20+ description : [
1821 'Sets the tick mode for this axis.' ,
1922 'If *auto*, the number of ticks is set via `nticks`.' ,
2023 'If *linear*, the placement of the ticks is determined by' ,
2124 'a starting position `tick0` and a tick step `dtick`' ,
2225 '(*linear* is the default value if `tick0` and `dtick` are provided).' ,
2326 'If *array*, the placement of the ticks is set via `tickvals`' ,
2427 'and the tick text is `ticktext`.' ,
25- '(*array* is the default value if `tickvals` is provided).' ,
28+ '(*array* is the default value if `tickvals` is provided).'
29+ ] . join ( ' ' )
30+ } ;
31+
32+ var tickmode = extendFlat ( { } , minorTickmode , {
33+ values : minorTickmode . values . slice ( ) . concat ( [ 'sync' ] ) ,
34+ description : [
35+ minorTickmode . description ,
2636 'If *sync*, the number of ticks will sync with the overlayed axis' ,
2737 'set by `overlaying` property.'
28- ] ;
29-
30- if ( minor ) {
31- values = values . slice ( 0 , - 1 ) ;
32- description = description . slice ( 0 , - 2 ) ;
33- }
34-
35- return {
36- valType : 'enumerated' ,
37- values : values ,
38- editType : 'ticks' ,
39- impliedEdits : { tick0 : undefined , dtick : undefined } ,
40- description : description . join ( ' ' )
41- } ;
42- }
38+ ] . join ( ' ' )
39+ } ) ;
4340
4441function makeNticks ( minor ) {
4542 return {
@@ -516,7 +513,7 @@ module.exports = {
516513 } ) ,
517514
518515 // ticks
519- tickmode : makeTickmode ( ) ,
516+ tickmode : tickmode ,
520517 nticks : makeNticks ( ) ,
521518 tick0 : tick0 ,
522519 dtick : dtick ,
@@ -959,7 +956,7 @@ module.exports = {
959956 } ,
960957
961958 minor : {
962- tickmode : makeTickmode ( 'minor' ) ,
959+ tickmode : minorTickmode ,
963960 nticks : makeNticks ( 'minor' ) ,
964961 tick0 : tick0 ,
965962 dtick : dtick ,
0 commit comments