@@ -636,8 +636,7 @@ axes.calcTicks = function calcTicks(ax) {
636
636
for ( var q = first ; dir * q <= dir * last ; q += dir ) { // apply reverse loop to pick greater values in breaks first
637
637
var tickVal = tickVals [ q ] ;
638
638
if ( ax . maskBreaks ( tickVal . value ) === BADNUM ) {
639
- tickVal . value = moveToEndOfBreak ( tickVal . value , ax ) ;
640
- if ( ax . maskBreaks ( tickVal . value ) === BADNUM ) continue ;
639
+ tickVal . value = moveOutsideBreak ( tickVal . value , ax , q < len - 1 ) ;
641
640
}
642
641
643
642
var pos = ax . c2p ( tickVal . value ) ;
@@ -959,7 +958,7 @@ axes.tickFirst = function(ax) {
959
958
var tick0 = r2l ( ax . tick0 ) ;
960
959
961
960
if ( ax . tickmode === 'auto' && ax . rangebreaks && ax . maskBreaks ( tick0 ) === BADNUM ) {
962
- tick0 = moveToEndOfBreak ( tick0 , ax ) ;
961
+ tick0 = moveOutsideBreak ( tick0 , ax , true ) ;
963
962
}
964
963
965
964
if ( isNumeric ( dtick ) ) {
@@ -3161,11 +3160,11 @@ function isAngular(ax) {
3161
3160
return ax . _id === 'angularaxis' ;
3162
3161
}
3163
3162
3164
- function moveToEndOfBreak ( v , ax ) {
3163
+ function moveOutsideBreak ( v , ax , toEnd ) {
3165
3164
for ( var k = 0 ; k < ax . _rangebreaks . length ; k ++ ) {
3166
3165
var brk = ax . _rangebreaks [ k ] ;
3167
3166
if ( v >= brk . min && v < brk . max ) {
3168
- return brk . max ;
3167
+ return toEnd ? brk . max : brk . min ;
3169
3168
}
3170
3169
}
3171
3170
return v ;
0 commit comments