@@ -25,7 +25,6 @@ var cleanTicks = require('./clean_ticks');
2525var constants = require ( '../../constants/numerical' ) ;
2626var ONEAVGYEAR = constants . ONEAVGYEAR ;
2727var ONEAVGMONTH = constants . ONEAVGMONTH ;
28- var ONEWEEK = constants . ONEWEEK ;
2928var ONEDAY = constants . ONEDAY ;
3029var ONEHOUR = constants . ONEHOUR ;
3130var ONEMIN = constants . ONEMIN ;
@@ -514,7 +513,7 @@ axes.prepTicks = function(ax) {
514513 minPx = ax . tickfont ? ( ax . tickfont . size || 12 ) * 1.2 : 15 ;
515514 nt = ax . _length / minPx ;
516515 } else {
517- minPx = ax . _hasDayOfWeekBreaks ? 40 : ax . _id . charAt ( 0 ) === 'y' ? 40 : 80 ;
516+ minPx = ax . _id . charAt ( 0 ) === 'y' ? 40 : 80 ;
518517 nt = Lib . constrain ( ax . _length / minPx , 4 , 9 ) + 1 ;
519518 }
520519
@@ -807,8 +806,7 @@ axes.autoTicks = function(ax, roughDTick) {
807806 roughDTick /= ONEAVGMONTH ;
808807 ax . dtick = 'M' + roundDTick ( roughDTick , 1 , roundBase24 ) ;
809808 } else if ( roughX2 > ONEDAY ) {
810- ax . dtick = roundDTick ( roughDTick , ONEDAY , roundDays ) ;
811- if ( ax . _hasDayOfWeekBreaks && ax . dtick < ONEWEEK ) ax . dtick = ONEWEEK ;
809+ ax . dtick = roundDTick ( roughDTick , ONEDAY , ax . _hasDayOfWeekBreaks ? [ 1 , 7 , 14 ] : roundDays ) ;
812810
813811 // get week ticks on sunday
814812 // this will also move the base tick off 2000-01-01 if dtick is
0 commit comments