Skip to content

Commit fbf6c92

Browse files
authored
Merge pull request #4684 from plotly/rangebreaks-handle-date-heads
Handle date heads on axes with rangebreaks
2 parents 73db02a + 15d1f8c commit fbf6c92

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

src/plots/cartesian/axes.js

+26-11
Original file line numberDiff line numberDiff line change
@@ -667,24 +667,39 @@ axes.calcTicks = function calcTicks(ax) {
667667
ax._prevDateHead = '';
668668
ax._inCalcTicks = true;
669669

670-
var ticksOut = new Array(tickVals.length);
671-
for(var i = 0; i < tickVals.length; i++) {
672-
ticksOut[i] = axes.tickText(
670+
var _value;
671+
var _minor;
672+
var calcTickText = function() {
673+
return axes.tickText(
673674
ax,
674-
tickVals[i].value,
675+
_value,
675676
false, // hover
676-
tickVals[i].minor // noSuffixPrefix
677+
_minor // noSuffixPrefix
677678
);
679+
};
680+
681+
var prevDateHead;
682+
var ticksOut = new Array(tickVals.length);
683+
for(var i = 0; i < tickVals.length; i++) {
684+
_minor = tickVals[i].minor;
685+
686+
_value = tickVals[i].value;
687+
ticksOut[i] = calcTickText();
678688

679689
if(tickVals[i]._realV) {
680690
// correct label
681-
ticksOut[i].text = axes.tickText(
682-
ax,
683-
tickVals[i]._realV,
684-
false, // hover
685-
tickVals[i].minor // noSuffixPrefix
686-
).text;
691+
_value = tickVals[i]._realV;
692+
693+
var short = calcTickText().text;
694+
ax._prevDateHead = '';
695+
var long = calcTickText().text;
696+
697+
ticksOut[i].text = (
698+
prevDateHead === ax._prevDateHead
699+
) ? short : long;
687700
}
701+
702+
prevDateHead = ax._prevDateHead;
688703
}
689704

690705
ax._inCalcTicks = false;
437 Bytes
Loading
Loading
Loading

0 commit comments

Comments
 (0)