Skip to content

Commit a90f95d

Browse files
committed
Do not display start and end periods on hover by default
This reverts following commits - 74070e0. - ba48115. - 94a164e.
1 parent f0c6d80 commit a90f95d

File tree

4 files changed

+6
-77
lines changed

4 files changed

+6
-77
lines changed

src/components/fx/hover.js

+2-9
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ var Drawing = require('../drawing');
2020
var Color = require('../color');
2121
var dragElement = require('../dragelement');
2222
var Axes = require('../../plots/cartesian/axes');
23-
var instanceOrPeriod = require('../../plots/cartesian/instance_or_period');
2423
var Registry = require('../../registry');
2524

2625
var helpers = require('./helpers');
@@ -1590,17 +1589,11 @@ function cleanPoint(d, hovermode) {
15901589

15911590
// and convert the x and y label values into formatted text
15921591
if(d.xLabelVal !== undefined) {
1593-
if(!('xLabel' in d)) {
1594-
var xx = instanceOrPeriod(d, trace, 'x');
1595-
d.xLabel = Axes.hoverLabelText(d.xa, xx[0], xx[1]);
1596-
}
1592+
d.xLabel = ('xLabel' in d) ? d.xLabel : Axes.hoverLabelText(d.xa, d.xLabelVal);
15971593
d.xVal = d.xa.c2d(d.xLabelVal);
15981594
}
15991595
if(d.yLabelVal !== undefined) {
1600-
if(!('yLabel' in d)) {
1601-
var yy = instanceOrPeriod(d, trace, 'y');
1602-
d.yLabel = Axes.hoverLabelText(d.ya, yy[0], yy[1]);
1603-
}
1596+
d.yLabel = ('yLabel' in d) ? d.yLabel : Axes.hoverLabelText(d.ya, d.yLabelVal);
16041597
d.yVal = d.ya.c2d(d.yLabelVal);
16051598
}
16061599

src/plots/cartesian/instance_or_period.js

-33
This file was deleted.

src/traces/histogram/hover.js

+2-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
var barHover = require('../bar/hover').hoverPoints;
1313
var hoverLabelText = require('../../plots/cartesian/axes').hoverLabelText;
14-
var instanceOrPeriod = require('../../plots/cartesian/instance_or_period');
1514

1615
module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
1716
var pts = barHover(pointData, xval, yval, hovermode);
@@ -24,15 +23,8 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode) {
2423

2524
if(!trace.cumulative.enabled) {
2625
var posLetter = trace.orientation === 'h' ? 'y' : 'x';
27-
var pp = instanceOrPeriod(pointData, trace, posLetter);
28-
var ax = pointData[posLetter + 'a'];
29-
var label;
30-
if(pp[1] !== undefined) {
31-
label = hoverLabelText(ax, pp[0], pp[1]);
32-
} else {
33-
label = hoverLabelText(ax, di.ph0, di.ph1);
34-
}
35-
pointData[posLetter + 'Label'] = label;
26+
27+
pointData[posLetter + 'Label'] = hoverLabelText(pointData[posLetter + 'a'], di.ph0, di.ph1);
3628
}
3729

3830
return pts;

src/traces/histogram2d/hover.js

+2-25
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
var heatmapHover = require('../heatmap/hover');
1313
var hoverLabelText = require('../../plots/cartesian/axes').hoverLabelText;
14-
var instanceOrPeriod = require('../../plots/cartesian/instance_or_period');
1514

1615
module.exports = function hoverPoints(pointData, xval, yval, hovermode, hoverLayer, contour) {
1716
var pts = heatmapHover(pointData, xval, yval, hovermode, hoverLayer, contour);
@@ -23,33 +22,11 @@ module.exports = function hoverPoints(pointData, xval, yval, hovermode, hoverLay
2322
var ny = indices[0];
2423
var nx = indices[1];
2524
var cd0 = pointData.cd[0];
26-
var trace = cd0.trace;
2725
var xRange = cd0.xRanges[nx];
2826
var yRange = cd0.yRanges[ny];
2927

30-
var x0 = xRange[0];
31-
var x1 = xRange[1];
32-
var xx = instanceOrPeriod(pointData, trace, 'x');
33-
var xa = pointData.xa;
34-
var xLabel;
35-
if(xx[1] !== undefined) {
36-
xLabel = hoverLabelText(xa, xx[0], xx[1]);
37-
} else {
38-
xLabel = hoverLabelText(xa, x0, x1);
39-
}
40-
pointData.xLabel = xLabel;
41-
42-
var y0 = yRange[0];
43-
var y1 = yRange[1];
44-
var yy = instanceOrPeriod(pointData, trace, 'y');
45-
var ya = pointData.ya;
46-
var yLabel;
47-
if(yy[1] !== undefined) {
48-
yLabel = hoverLabelText(ya, yy[0], yy[1]);
49-
} else {
50-
yLabel = hoverLabelText(ya, y0, y1);
51-
}
52-
pointData.yLabel = yLabel;
28+
pointData.xLabel = hoverLabelText(pointData.xa, xRange[0], xRange[1]);
29+
pointData.yLabel = hoverLabelText(pointData.ya, yRange[0], yRange[1]);
5330

5431
return pts;
5532
};

0 commit comments

Comments
 (0)