diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js index 3a2ee355658..798d53cae33 100644 --- a/src/plots/cartesian/axes.js +++ b/src/plots/cartesian/axes.js @@ -620,7 +620,6 @@ axes.calcTicks = function calcTicks(ax) { for(var k = 0; k < ax._rangebreaks.length; k++) { var brk = ax._rangebreaks[k]; if(value >= brk.min && value < brk.max) { - tickVals[t]._realV = tickVals[t].value; tickVals[t].value = brk.max; // replace with break end break; } @@ -667,39 +666,17 @@ axes.calcTicks = function calcTicks(ax) { ax._prevDateHead = ''; ax._inCalcTicks = true; - var _value; - var _minor; - var calcTickText = function() { - return axes.tickText( + var ticksOut = new Array(tickVals.length); + for(var i = 0; i < tickVals.length; i++) { + var _minor = tickVals[i].minor; + var _value = tickVals[i].value; + + ticksOut[i] = axes.tickText( ax, _value, false, // hover _minor // noSuffixPrefix ); - }; - - var prevDateHead; - var ticksOut = new Array(tickVals.length); - for(var i = 0; i < tickVals.length; i++) { - _minor = tickVals[i].minor; - - _value = tickVals[i].value; - ticksOut[i] = calcTickText(); - - if(tickVals[i]._realV) { - // correct label - _value = tickVals[i]._realV; - - var short = calcTickText().text; - ax._prevDateHead = ''; - var long = calcTickText().text; - - ticksOut[i].text = ( - prevDateHead === ax._prevDateHead - ) ? short : long; - } - - prevDateHead = ax._prevDateHead; } ax._inCalcTicks = false; diff --git a/test/image/baselines/axes_breaks-finance.png b/test/image/baselines/axes_breaks-finance.png index 652047b7835..2d6d56d9859 100644 Binary files a/test/image/baselines/axes_breaks-finance.png and b/test/image/baselines/axes_breaks-finance.png differ diff --git a/test/image/baselines/axes_breaks-night_autorange-reversed.png b/test/image/baselines/axes_breaks-night_autorange-reversed.png index 32c542836eb..94c241d3abc 100644 Binary files a/test/image/baselines/axes_breaks-night_autorange-reversed.png and b/test/image/baselines/axes_breaks-night_autorange-reversed.png differ diff --git a/test/image/baselines/axes_breaks-rangeslider.png b/test/image/baselines/axes_breaks-rangeslider.png index a71f3fbdd24..b606ae82dc2 100644 Binary files a/test/image/baselines/axes_breaks-rangeslider.png and b/test/image/baselines/axes_breaks-rangeslider.png differ diff --git a/test/image/baselines/axes_breaks-round-weekdays.png b/test/image/baselines/axes_breaks-round-weekdays.png index 98a7e1e38af..e24853a9992 100644 Binary files a/test/image/baselines/axes_breaks-round-weekdays.png and b/test/image/baselines/axes_breaks-round-weekdays.png differ diff --git a/test/image/baselines/axes_breaks-weekends-weeknights.png b/test/image/baselines/axes_breaks-weekends-weeknights.png index 4fa6a3287e7..c0b8991903e 100644 Binary files a/test/image/baselines/axes_breaks-weekends-weeknights.png and b/test/image/baselines/axes_breaks-weekends-weeknights.png differ