Skip to content

Commit e1de1af

Browse files
authored
Merge pull request #4696 from plotly/tick-label-inside-rangebreaks
Do not show tick labels falling inside rangebreaks
2 parents 10e7fd0 + 9af7209 commit e1de1af

6 files changed

+6
-29
lines changed

src/plots/cartesian/axes.js

+6-29
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ axes.calcTicks = function calcTicks(ax) {
620620
for(var k = 0; k < ax._rangebreaks.length; k++) {
621621
var brk = ax._rangebreaks[k];
622622
if(value >= brk.min && value < brk.max) {
623-
tickVals[t]._realV = tickVals[t].value;
624623
tickVals[t].value = brk.max; // replace with break end
625624
break;
626625
}
@@ -667,39 +666,17 @@ axes.calcTicks = function calcTicks(ax) {
667666
ax._prevDateHead = '';
668667
ax._inCalcTicks = true;
669668

670-
var _value;
671-
var _minor;
672-
var calcTickText = function() {
673-
return axes.tickText(
669+
var ticksOut = new Array(tickVals.length);
670+
for(var i = 0; i < tickVals.length; i++) {
671+
var _minor = tickVals[i].minor;
672+
var _value = tickVals[i].value;
673+
674+
ticksOut[i] = axes.tickText(
674675
ax,
675676
_value,
676677
false, // hover
677678
_minor // noSuffixPrefix
678679
);
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();
688-
689-
if(tickVals[i]._realV) {
690-
// correct label
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;
700-
}
701-
702-
prevDateHead = ax._prevDateHead;
703680
}
704681

705682
ax._inCalcTicks = false;
206 Bytes
Loading
Loading
76 Bytes
Loading
229 Bytes
Loading
Loading

0 commit comments

Comments
 (0)