Skip to content

Commit 23a21c1

Browse files
committed
Simplify code for standoff sign
(no need to test if ax.side matches axis, because this check is done before)
1 parent e3b0baa commit 23a21c1

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/plots/cartesian/axes.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2974,8 +2974,6 @@ axes.makeTransTickLabelFn = function(ax) {
29742974
var u = uv[0];
29752975
var v = uv[1];
29762976

2977-
var isXaxis = ax._id.charAt(0) === 'x';
2978-
var isYaxis = !isXaxis;
29792977
var isReversed = ax.range[0] > ax.range[1];
29802978
var labelsInside = ax.ticklabelposition && ax.ticklabelposition.indexOf('inside') !== -1;
29812979
var labelsOutside = !labelsInside;
@@ -2985,14 +2983,14 @@ axes.makeTransTickLabelFn = function(ax) {
29852983
shift = shift * shiftSign;
29862984
}
29872985
if(standoff) {
2988-
var standoffSign =
2989-
isXaxis && ax.side === 'bottom' && labelsOutside ||
2990-
isXaxis && ax.side === 'top' && labelsInside ||
2991-
isYaxis && ax.side === 'right' && labelsOutside ||
2992-
isYaxis && ax.side === 'left' && labelsInside ? 1 : -1;
2986+
var side = ax.side;
2987+
var standoffSign = (
2988+
(labelsInside && (side === 'top' || side === 'left')) ||
2989+
(labelsOutside && (side === 'bottom' || side === 'right'))
2990+
) ? 1 : -1;
29932991
standoff = standoff * standoffSign;
29942992
}
2995-
return isXaxis ?
2993+
return ax._id.charAt(0) === 'x' ?
29962994
function(d) {
29972995
return strTranslate(
29982996
u + ax._offset + ax.l2p(getPosX(d)) + shift,

0 commit comments

Comments
 (0)