Skip to content

Fixup sort transform event data text using #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 25, 2017
Merged

Fixup sort transform event data text using #1727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d49f0ad
test sort transform event data using hover only
etpinard May 25, 2017
50e36f5
reject hover promise if didn't resolve after 100ms
etpinard May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 9 additions & 27 deletions test/jasmine/tests/transform_sort_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ describe('Test sort transform interactions:', function() {
.then(done);
});

it('does not preserve hover/click `pointNumber` value', function(done) {
it('does not preserve event data `pointNumber` value', function(done) {
var gd = createGraphDiv();

function getPxPos(gd, id) {
Expand All @@ -273,32 +273,18 @@ describe('Test sort transform interactions:', function() {
}

function hover(gd, id) {
return new Promise(function(resolve) {
return new Promise(function(resolve, reject) {
gd.once('plotly_hover', function(eventData) {
delete gd._lastHoverTime;
resolve(eventData);
});

var pos = getPxPos(gd, id);
mouseEvent('mousemove', pos[0], pos[1]);
});
}

function click(gd, id) {
return new Promise(function(resolve) {
gd.once('plotly_click', function(eventData) {
resolve(eventData);
});

var pos = getPxPos(gd, id);
mouseEvent('mousemove', pos[0], pos[1]);
mouseEvent('mousedown', pos[0], pos[1]);
mouseEvent('mouseup', pos[0], pos[1]);
});
}

function wait() {
return new Promise(function(resolve) {
setTimeout(resolve, 100);
setTimeout(function() {
reject('plotly_hover did not get called!');
}, 100);
});
}

Expand Down Expand Up @@ -334,21 +320,18 @@ describe('Test sort transform interactions:', function() {
.then(function(eventData) {
assertPt(eventData, 0, 1, 3, 'D');
})
.then(wait)
.then(function() { return click(gd, 'G'); })
.then(function() { return hover(gd, 'G'); })
.then(function(eventData) {
assertPt(eventData, 1, 1, 6, 'G');
})
.then(wait)
.then(function() {
return Plotly.restyle(gd, 'transforms[0].enabled', true);
})
.then(function() { return hover(gd, 'D'); })
.then(function(eventData) {
assertPt(eventData, 0, 1, 1, 'D');
})
.then(wait)
.then(function() { return click(gd, 'G'); })
.then(function() { return hover(gd, 'G'); })
.then(function(eventData) {
assertPt(eventData, 1, 1, 5, 'G');
})
Expand All @@ -359,8 +342,7 @@ describe('Test sort transform interactions:', function() {
.then(function(eventData) {
assertPt(eventData, 0, 1, 1, 'D');
})
.then(wait)
.then(function() { return click(gd, 'G'); })
.then(function() { return hover(gd, 'G'); })
.then(function(eventData) {
assertPt(eventData, 1, 1, 5, 'G');
})
Expand Down