Skip to content

Add doubleclick events#255

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
etpinard merged 15 commits into from
Feb 24, 2016
Merged

Add doubleclick events #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bd6995e
wip emit double click eventData
etpinard Jan 21, 2016
10cded2
emit 'plotly_doubleclick' events,
etpinard Feb 15, 2016
8b6783f
flatten click test describe struc
etpinard Feb 15, 2016
e8ef663
add double click test
etpinard Feb 15, 2016
d46ae26
add select/lasso jasmine tests
etpinard Feb 15, 2016
02eca97
revert Plots object in register,
etpinard Feb 15, 2016
782f692
use toBeCloseTo to assert selection ranges,
etpinard Feb 15, 2016
5b1e895
add comment about click events simulators
etpinard Feb 17, 2016
c41a756
make jasmine describe more explicit
etpinard Feb 17, 2016
9c19406
try sending hoverdata on double click:
etpinard Feb 17, 2016
e7e0889
Merge branch 'master' into emit-doubleclick
etpinard Feb 24, 2016
848f4a5
move destroyGraphDiv to suite level
etpinard Feb 24, 2016
4c5103f
send null on plotly_doubleclick events:
etpinard Feb 24, 2016
d517c4f
make doubleclick in select/lasso mode emit its own event: plotly_dese…
etpinard Feb 24, 2016
90edb18
update click and select tests
etpinard Feb 24, 2016
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
1 change: 1 addition & 0 deletions src/plots/cartesian/graph_interact.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
}
}

gd.emit('plotly_doubleclick', null);
Plotly.relayout(gd, attrs);
}

Expand Down
2 changes: 2 additions & 0 deletions src/plots/cartesian/select.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
searchInfo = searchTraces[i];
searchInfo.selectPoints(searchInfo, false);
}

gd.emit('plotly_deselect', null);

@etpinardetpinardFeb 24, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert

}
else {
dragOptions.gd.emit('plotly_selected', eventData);
Expand Down
77 changes: 56 additions & 21 deletions test/jasmine/tests/click_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
var mock = require('@mocks/14.json');
describe('click interactions', function() {
var mock = require('@mocks/14.json'),
mockCopy = Lib.extendDeep({}, mock),
gd;

describe('event data', function() {
var mockCopy = Lib.extendDeep({}, mock),
clientX = 351,
clientY = 223,
gd;
var pointPos = [351, 223],
blankPos = [70, 363];

function click() {
mouseEvent('mousemove', clientX, clientY);
mouseEvent('mousedown', clientX, clientY);
mouseEvent('mouseup', clientX, clientY);
}
afterEach(destroyGraphDiv);

beforeEach(function(done) {
gd = createGraphDiv();
// cartesian click events events use the hover data
// from the mousemove events and then simulate
// a click event on mouseup
function click(x, y) {
mouseEvent('mousemove', x, y);
mouseEvent('mousedown', x, y);
mouseEvent('mouseup', x, y);
}

Plotly.plot(gd, mockCopy.data, mockCopy.layout)
.then(done);
});
function doubleClick(x, y, cb) {
click(x, y);
setTimeout(function() {
click(x, y);
cb();
}, DBLCLICKDELAY / 2);
}

afterEach(destroyGraphDiv);
beforeEach(function(done) {
gd = createGraphDiv();

it('should contain the correct fields', function() {
var futureData;
Plotly.plot(gd, mockCopy.data, mockCopy.layout)
.then(done);
});

describe('click events', function() {
var futureData;

beforeEach(function() {
gd.on('plotly_click', function(data) {
futureData = data;
});
});

click();
it('should not be trigged when not on data points', function() {
click(blankPos[0], blankPos[1]);
expect(futureData).toBe(undefined);
});

it('should contain the correct fields', function() {
click(pointPos[0], pointPos[1]);
expect(futureData.points.length).toEqual(1);

var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
expect(pt.y).toEqual(2.125);
});
});

describe('double click events', function() {
var futureData;

beforeEach(function() {
gd.on('plotly_doubleclick', function(data) {
futureData = data;
});
});

it('should return null', function(done) {
doubleClick(pointPos[0], pointPos[1], function() {
expect(futureData).toBe(null);
done();
});
});
});
});
20 changes: 3 additions & 17 deletions test/jasmine/tests/plot_promise_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
'use strict';

afterEach(destroyGraphDiv);

describe('Plotly.plot promise', function() {
var promise,
promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
});
});

afterEach(destroyGraphDiv);

it('should be rejected when plotly_beforeplot event handlers return false', function() {
expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
});
});

afterEach(destroyGraphDiv);

it('should reject the promise when graph is being dragged', function() {
expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be rejected when the attribute is missing', function() {
expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div as an argument', function() {
expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be returned with the graph div unchanged when the framework is polar', function() {
expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
done();
});
});
afterEach(destroyGraphDiv);

it('should be rejected when the attribute is missing', function() {
expect(promiseRejected).toBe(true);
Expand Down
21 changes: 21 additions & 0 deletions test/jasmine/tests/register_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
'use strict';

var Plots = Plotly.Plots;

beforeEach(function() {
this.modulesKeys = Object.keys(Plots.modules);

@mdtuszmdtuszFeb 16, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?

@etpinardetpinardFeb 16, 2016

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

You're not a fan of the jasmine this ?

@mdtuszmdtuszFeb 16, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.

this.allTypesKeys = Object.keys(Plots.allTypes);
this.allCategoriesKeys = Object.keys(Plots.allCategories);
});

afterEach(function() {
function revertObj(obj, initialKeys) {
Object.keys(obj).forEach(function(k) {
if(initialKeys.indexOf(k) === -1) delete obj[k];
});
}

revertObj(Plots.modules, this.modulesKeys);
revertObj(Plots.allTypes, this.allTypesKeys);
revertObj(Plots.allCategories, this.allCategoriesKeys);
});

it('should throw an error when no argument is given', function() {
expect(function() {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add doubleclick events by etpinard · Pull Request #255 · plotly/plotly.js · GitHub
Skip to content
Add doubleclick events#255

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

etpinard
merged 15 commits into

from

Feb 24, 2016
 Merged


Add doubleclick events
#255
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
bd6995e

wip emit double click eventData


etpinard Jan 21, 2016
10cded2

emit 'plotly_doubleclick' events,


etpinard Feb 15, 2016
8b6783f

flatten click test describe struc


etpinard Feb 15, 2016
e8ef663

add double click test


etpinard Feb 15, 2016
d46ae26

add select/lasso jasmine tests


etpinard Feb 15, 2016
02eca97

revert Plots object in register,


etpinard Feb 15, 2016
782f692

use toBeCloseTo to assert selection ranges,


etpinard Feb 15, 2016
5b1e895

add comment about click events simulators


etpinard Feb 17, 2016
c41a756

make jasmine describe more explicit


etpinard Feb 17, 2016
9c19406

try sending hoverdata on double click:


etpinard Feb 17, 2016
e7e0889

Merge branch 'master' into emit-doubleclick


etpinard Feb 24, 2016
848f4a5

move destroyGraphDiv to suite level


etpinard Feb 24, 2016
4c5103f

send null on plotly_doubleclick events:


etpinard Feb 24, 2016
d517c4f

make doubleclick in select/lasso mode emit its own event: plotly_dese…


etpinard Feb 24, 2016
90edb18

update click and select tests


etpinard Feb 24, 2016

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


1 change: 1 addition & 0 deletions
src/plots/cartesian/graph_interact.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1822,6 +1822,7 @@ function dragBox(gd, plotinfo, x, y, w, h, ns, ew) {
 }
 }

 gd.emit('plotly_doubleclick', null);
 Plotly.relayout(gd, attrs);
 }

Expand Down

2 changes: 2 additions & 0 deletions
src/plots/cartesian/select.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -171,6 +171,8 @@ module.exports = function prepSelect(e, startX, startY, dragOptions, mode) {
 searchInfo = searchTraces[i];
 searchInfo.selectPoints(searchInfo, false);
 }

 gd.emit('plotly_deselect', null);
@etpinardetpinardFeb 24, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi @cpsievert
 }
 else {
 dragOptions.gd.emit('plotly_selected', eventData);
Expand Down

77 changes: 56 additions & 21 deletions
test/jasmine/tests/click_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
var Plotly = require('@lib/index');
var Lib = require('@src/lib');
var DBLCLICKDELAY = require('@src/plots/cartesian/constants').DBLCLICKDELAY;

var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');
var mouseEvent = require('../assets/mouse_event');


describe('click event', function() {
 var mock = require('@mocks/14.json');
describe('click interactions', function() {
 var mock = require('@mocks/14.json'),
 mockCopy = Lib.extendDeep({}, mock),
 gd;

 describe('event data', function() {
 var mockCopy = Lib.extendDeep({}, mock),
 clientX = 351,
 clientY = 223,
 gd;
 var pointPos = [351, 223],
 blankPos = [70, 363];

 function click() {
 mouseEvent('mousemove', clientX, clientY);
 mouseEvent('mousedown', clientX, clientY);
 mouseEvent('mouseup', clientX, clientY);
 }
 afterEach(destroyGraphDiv);

 beforeEach(function(done) {
 gd = createGraphDiv();
 // cartesian click events events use the hover data
 // from the mousemove events and then simulate
 // a click event on mouseup
 function click(x, y) {
 mouseEvent('mousemove', x, y);
 mouseEvent('mousedown', x, y);
 mouseEvent('mouseup', x, y);
 }

 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });
 function doubleClick(x, y, cb) {
 click(x, y);
 setTimeout(function() {
 click(x, y);
 cb();
 }, DBLCLICKDELAY / 2);
 }

 afterEach(destroyGraphDiv);
 beforeEach(function(done) {
 gd = createGraphDiv();

 it('should contain the correct fields', function() {
 var futureData;
 Plotly.plot(gd, mockCopy.data, mockCopy.layout)
 .then(done);
 });

 describe('click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_click', function(data) {
 futureData = data;
 });
 });

 click();
 it('should not be trigged when not on data points', function() {
 click(blankPos[0], blankPos[1]);
 expect(futureData).toBe(undefined);
 });

 it('should contain the correct fields', function() {
 click(pointPos[0], pointPos[1]);
 expect(futureData.points.length).toEqual(1);

 var pt = futureData.points[0];
Expand All@@ -52,4 +70,21 @@ describe('click event', function() {
 expect(pt.y).toEqual(2.125);
 });
 });

 describe('double click events', function() {
 var futureData;

 beforeEach(function() {
 gd.on('plotly_doubleclick', function(data) {
 futureData = data;
 });
 });

 it('should return null', function(done) {
 doubleClick(pointPos[0], pointPos[1], function() {
 expect(futureData).toBe(null);
 done();
 });
 });
 });
});

20 changes: 3 additions & 17 deletions
test/jasmine/tests/plot_promise_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,12 @@ var Events = require('@src/lib/events');
var createGraphDiv = require('../assets/create_graph_div');
var destroyGraphDiv = require('../assets/destroy_graph_div');


describe('Plotly.___ methods', function() {
 'use strict';

 afterEach(destroyGraphDiv);

 describe('Plotly.plot promise', function() {
 var promise,
 promiseGd;
Expand All@@ -20,7 +23,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -54,7 +56,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should be rejected when plotly_beforeplot event handlers return false', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -81,7 +82,6 @@ describe('Plotly.___ methods', function() {
 });
 });

 afterEach(destroyGraphDiv);

 it('should reject the promise when graph is being dragged', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -105,7 +105,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -129,7 +128,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -156,7 +154,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -183,7 +180,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -210,7 +206,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -237,7 +232,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -264,7 +258,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -294,7 +287,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -321,7 +313,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -348,7 +339,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand All@@ -373,7 +363,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -401,7 +390,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div as an argument', function() {
 expect(promiseGd).toBeDefined();
Expand DownExpand Up@@ -430,7 +418,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be returned with the graph div unchanged when the framework is polar', function() {
 expect(promiseGd).toBeDefined();
Expand All@@ -457,7 +444,6 @@ describe('Plotly.___ methods', function() {
 done();
 });
 });
 afterEach(destroyGraphDiv);

 it('should be rejected when the attribute is missing', function() {
 expect(promiseRejected).toBe(true);
Expand Down

21 changes: 21 additions & 0 deletions
test/jasmine/tests/register_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
var Plotly = require('@lib/index');

describe('the register function', function() {
 'use strict';

 var Plots = Plotly.Plots;

 beforeEach(function() {
 this.modulesKeys = Object.keys(Plots.modules);
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we avoid using this here?
@etpinardetpinardFeb 16, 2016

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.
You're not a fan of the jasmine this ?
@mdtuszmdtuszFeb 16, 2016

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually on second look, I'm ok with that. Didn't know that it was jasmine convention and that the this is cleared between specs.
 this.allTypesKeys = Object.keys(Plots.allTypes);
 this.allCategoriesKeys = Object.keys(Plots.allCategories);
 });

 afterEach(function() {
 function revertObj(obj, initialKeys) {
 Object.keys(obj).forEach(function(k) {
 if(initialKeys.indexOf(k) === -1) delete obj[k];
 });
 }

 revertObj(Plots.modules, this.modulesKeys);
 revertObj(Plots.allTypes, this.allTypesKeys);
 revertObj(Plots.allCategories, this.allCategoriesKeys);
 });

 it('should throw an error when no argument is given', function() {
 expect(function() {
Expand Down
Loading