Skip to content

Commit 969420f

Browse files
committed
remove period addition hacks now that the filter is gone
1 parent 1903583 commit 969420f

File tree

2 files changed

+4
-32
lines changed

2 files changed

+4
-32
lines changed

src/components/fx/hover.js

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ var Drawing = require('../drawing');
1414
var Color = require('../color');
1515
var dragElement = require('../dragelement');
1616
var Axes = require('../../plots/cartesian/axes');
17-
var alignPeriod = require('../../plots/cartesian/align_period');
1817
var Registry = require('../../registry');
1918

2019
var helpers = require('./helpers');
@@ -662,34 +661,8 @@ function _hover(gd, evt, subplot, noHoverEvent) {
662661

663662
findHoverPoints(customXVal, customYVal);
664663

665-
// also find start, middle and end point for period
666664
var axLetter = hovermode.charAt(0);
667665
if(winningPoint.trace[axLetter + 'period']) {
668-
var v = winningPoint[axLetter + 'LabelVal'];
669-
var ax = winningPoint[axLetter + 'a'];
670-
var T = {};
671-
T[axLetter + 'period'] = winningPoint.trace[axLetter + 'period'];
672-
T[axLetter + 'period0'] = winningPoint.trace[axLetter + 'period0'];
673-
674-
T[axLetter + 'periodalignment'] = 'start';
675-
var start = alignPeriod(T, ax, axLetter, [v])[0];
676-
677-
T[axLetter + 'periodalignment'] = 'middle';
678-
var middle = alignPeriod(T, ax, axLetter, [v])[0];
679-
680-
T[axLetter + 'periodalignment'] = 'end';
681-
var end = alignPeriod(T, ax, axLetter, [v])[0];
682-
683-
if(axLetter === 'x') {
684-
findHoverPoints(start, customYVal);
685-
findHoverPoints(middle, customYVal);
686-
findHoverPoints(end, customYVal);
687-
} else {
688-
findHoverPoints(customXVal, start);
689-
findHoverPoints(customXVal, middle);
690-
findHoverPoints(customXVal, end);
691-
}
692-
693666
var k;
694667
var seen = {};
695668
for(k = 0; k < initLen; k++) {

test/jasmine/tests/hover_label_test.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4974,6 +4974,7 @@ describe('hovermode: (x|y)unified', function() {
49744974

49754975
_hover(gd, { xpx: 100, ypx: 200 });
49764976
assertLabel({title: 'Jan 1, 2000', items: [
4977+
'bar : (Dec, 2)',
49774978
'scatter : 1.1'
49784979
]});
49794980

@@ -5051,22 +5052,20 @@ describe('hovermode: (x|y)unified', function() {
50515052
_hover(gd, { xpx: 40, ypx: 200 });
50525053
assertLabel({title: 'Jan', items: [
50535054
'bar : (Jan 1, 2000, 1)',
5054-
'start : 1',
5055-
'end : 1'
5055+
'start : 1'
50565056
]});
50575057

50585058
_hover(gd, { xpx: 100, ypx: 200 });
50595059
assertLabel({title: 'Jan 1, 2000', items: [
50605060
'bar : 1',
5061-
'start : (Jan, 1)',
5062-
'end : (Jan, 1)'
5061+
'start : (Jan, 1)'
50635062
]});
50645063

50655064
_hover(gd, { xpx: 360, ypx: 200 });
50665065
assertLabel({title: 'Feb 1, 2000', items: [
50675066
'bar : 2',
50685067
'start : (Feb, 2)',
5069-
'end : (Feb, 2)'
5068+
'end : (Jan, 1)'
50705069
]});
50715070

50725071
_hover(gd, { xpx: 400, ypx: 200 });

0 commit comments

Comments
 (0)