diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js index 4d69a881431..544c0d327cc 100644 --- a/src/plots/cartesian/axes.js +++ b/src/plots/cartesian/axes.js @@ -667,24 +667,39 @@ axes.calcTicks = function calcTicks(ax) { ax._prevDateHead = ''; ax._inCalcTicks = true; - var ticksOut = new Array(tickVals.length); - for(var i = 0; i < tickVals.length; i++) { - ticksOut[i] = axes.tickText( + var _value; + var _minor; + var calcTickText = function() { + return axes.tickText( ax, - tickVals[i].value, + _value, false, // hover - tickVals[i].minor // noSuffixPrefix + _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 - ticksOut[i].text = axes.tickText( - ax, - tickVals[i]._realV, - false, // hover - tickVals[i].minor // noSuffixPrefix - ).text; + _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 3242ac1ae8f..652047b7835 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 a60758be941..32c542836eb 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-weekends-weeknights.png b/test/image/baselines/axes_breaks-weekends-weeknights.png index 51673357cab..4fa6a3287e7 100644 Binary files a/test/image/baselines/axes_breaks-weekends-weeknights.png and b/test/image/baselines/axes_breaks-weekends-weeknights.png differ