zhangaz1
diff --git a/‎src/plots/cartesian/axes.js
Lines changed: 11 additions & 10 deletions b/‎src/plots/cartesian/axes.js
Lines changed: 11 additions & 10 deletions
diff --git a/‎test/image/baselines/axes_breaks-dtick_auto.png
129 Bytes b/‎test/image/baselines/axes_breaks-dtick_auto.png
129 Bytes
diff --git a/‎test/image/baselines/axes_breaks-dtick_hourly.png
1.2 KB b/‎test/image/baselines/axes_breaks-dtick_hourly.png
1.2 KB
diff --git a/‎test/image/baselines/axes_breaks-finance.png
-22 Bytes b/‎test/image/baselines/axes_breaks-finance.png
-22 Bytes
diff --git a/‎test/image/baselines/axes_breaks-gridlines.png
-71 Bytes b/‎test/image/baselines/axes_breaks-gridlines.png
-71 Bytes
diff --git a/‎test/image/baselines/axes_breaks-rangeslider.png
-52 Bytes b/‎test/image/baselines/axes_breaks-rangeslider.png
-52 Bytes
diff --git a/‎test/image/baselines/axes_breaks-round-weekdays.png
123 Bytes b/‎test/image/baselines/axes_breaks-round-weekdays.png
123 Bytes
diff --git a/‎test/image/baselines/axes_breaks-values.png
574 Bytes b/‎test/image/baselines/axes_breaks-values.png
574 Bytes
diff --git a/‎test/image/baselines/axes_breaks-weekends-weeknights.png
67 Bytes b/‎test/image/baselines/axes_breaks-weekends-weeknights.png
67 Bytes
diff --git a/‎test/image/baselines/axes_breaks.png
-329 Bytes b/‎test/image/baselines/axes_breaks.png
-329 Bytes
@@ -630,13 +630,13 @@ axes.calcTicks = function calcTicks(ax) {
             var newTickVals = [];
             var prevPos;
 
-            var dir = axrev ? 1 : -1;
-            var first = axrev ? 0 : len - 1;
-            var last = axrev ? len - 1 : 0;
-            for(var q = first; dir * q <= dir * last; q += dir) { // apply reverse loop to pick greater values in breaks first
+            var dir = axrev ? -1 : 1;
+            var first = axrev ? len - 1 : 0;
+            var last = axrev ? 0 : len - 1;
+            for(var q = first; dir * q <= dir * last; q += dir) {
                 var tickVal = tickVals[q];
                 if(ax.maskBreaks(tickVal.value) === BADNUM) {
-                    tickVal.value = moveOutsideBreak(tickVal.value, ax, q < len - 1);
+                    tickVal.value = moveOutsideBreak(tickVal.value, ax);
                 }
 
                 var pos = ax.c2p(tickVal.value);
@@ -645,7 +645,7 @@ axes.calcTicks = function calcTicks(ax) {
                     newTickVals.push(tickVal);
                 }
             }
-            tickVals = newTickVals.reverse();
+            tickVals = newTickVals;
         }
     }
 
@@ -958,7 +958,7 @@ axes.tickFirst = function(ax) {
     var tick0 = r2l(ax.tick0);
 
     if(ax.tickmode === 'auto' && ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {
-        tick0 = moveOutsideBreak(tick0, ax, true);
+        tick0 = moveOutsideBreak(tick0, ax);
     }
 
     if(isNumeric(dtick)) {
@@ -3160,11 +3160,12 @@ function isAngular(ax) {
     return ax._id === 'angularaxis';
 }
 
-function moveOutsideBreak(v, ax, toEnd) {
-    for(var k = 0; k < ax._rangebreaks.length; k++) {
+function moveOutsideBreak(v, ax) {
+    var len = ax._rangebreaks.length;
+    for(var k = 0; k < len; k++) {
         var brk = ax._rangebreaks[k];
         if(v >= brk.min && v < brk.max) {
-            return toEnd ? brk.max : brk.min;
+            return brk.max;
         }
     }
     return v;
Original file line number	Diff line number	Diff line change
`@@ -630,13 +630,13 @@ axes.calcTicks = function calcTicks(ax) {`
`630`	`630`	`var newTickVals = [];`
`631`	`631`	`var prevPos;`
`632`	`632`
`633`		`- var dir = axrev ? 1 : -1;`
`634`		`- var first = axrev ? 0 : len - 1;`
`635`		`- var last = axrev ? len - 1 : 0;`
`636`		`- for(var q = first; dir * q <= dir * last; q += dir) { // apply reverse loop to pick greater values in breaks first`
	`633`	`+ var dir = axrev ? -1 : 1;`
	`634`	`+ var first = axrev ? len - 1 : 0;`
	`635`	`+ var last = axrev ? 0 : len - 1;`
	`636`	`+ for(var q = first; dir * q <= dir * last; q += dir) {`
`637`	`637`	`var tickVal = tickVals[q];`
`638`	`638`	`if(ax.maskBreaks(tickVal.value) === BADNUM) {`
`639`		`- tickVal.value = moveOutsideBreak(tickVal.value, ax, q < len - 1);`
	`639`	`+ tickVal.value = moveOutsideBreak(tickVal.value, ax);`
`640`	`640`	`}`
`641`	`641`
`642`	`642`	`var pos = ax.c2p(tickVal.value);`
`@@ -645,7 +645,7 @@ axes.calcTicks = function calcTicks(ax) {`
`645`	`645`	`newTickVals.push(tickVal);`
`646`	`646`	`}`
`647`	`647`	`}`
`648`		`- tickVals = newTickVals.reverse();`
	`648`	`+ tickVals = newTickVals;`
`649`	`649`	`}`
`650`	`650`	`}`
`651`	`651`
`@@ -958,7 +958,7 @@ axes.tickFirst = function(ax) {`
`958`	`958`	`var tick0 = r2l(ax.tick0);`
`959`	`959`
`960`	`960`	`if(ax.tickmode === 'auto' && ax.rangebreaks && ax.maskBreaks(tick0) === BADNUM) {`
`961`		`- tick0 = moveOutsideBreak(tick0, ax, true);`
	`961`	`+ tick0 = moveOutsideBreak(tick0, ax);`
`962`	`962`	`}`
`963`	`963`
`964`	`964`	`if(isNumeric(dtick)) {`
`@@ -3160,11 +3160,12 @@ function isAngular(ax) {`
`3160`	`3160`	`return ax._id === 'angularaxis';`
`3161`	`3161`	`}`
`3162`	`3162`
`3163`		`-function moveOutsideBreak(v, ax, toEnd) {`
`3164`		`- for(var k = 0; k < ax._rangebreaks.length; k++) {`
	`3163`	`+function moveOutsideBreak(v, ax) {`
	`3164`	`+ var len = ax._rangebreaks.length;`
	`3165`	`+ for(var k = 0; k < len; k++) {`
`3165`	`3166`	`var brk = ax._rangebreaks[k];`
`3166`	`3167`	`if(v >= brk.min && v < brk.max) {`
`3167`		`- return toEnd ? brk.max : brk.min;`
	`3168`	`+ return brk.max;`
`3168`	`3169`	`}`
`3169`	`3170`	`}`
`3170`	`3171`	`return v;`