Skip to content

Drag outside window #2075

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2017
Merged

Drag outside window #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee8db9
add commented-out IE9/10 code to test_dashboard for easier testing
alexcjohnson Oct 9, 2017
24bdbc4
allow dragging outside the window, by listening to document instead o…
alexcjohnson Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions devtools/test_dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
</div>
<div id="snapshot"></div>

<!-- uncomment below for IE9/10 support -->
<!-- <script>if(typeof window.Int16Array !== 'function')document.write("<scri"+"pt src='../../dist/extras/typedarray.min.js'></scr"+"ipt>");</script>
<script>document.write("<scri"+"pt src='../../dist/extras/request_animation_frame.js'></scr"+"ipt>");</script> -->

<script type="text/javascript" src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
<script id="source" type="text/javascript" src="../../build/plotly.js"></script>
<script type="text/javascript" src="../../build/test_dashboard-bundle.js"></script>
Expand Down
46 changes: 23 additions & 23 deletions src/components/dragelement/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,12 @@ dragElement.unhoverRaw = unhover.raw;
* e is the original event
*/
dragElement.init = function init(options) {
var gd = options.gd,
numClicks = 1,
DBLCLICKDELAY = interactConstants.DBLCLICKDELAY,
startX,
var gd = options.gd;
var numClicks = 1;
var DBLCLICKDELAY = interactConstants.DBLCLICKDELAY;
var element = options.element;

var startX,
startY,
newMouseDownTime,
cursor,
Expand All @@ -70,10 +72,10 @@ dragElement.init = function init(options) {

if(!gd._mouseDownTime) gd._mouseDownTime = 0;

options.element.style.pointerEvents = 'all';
element.style.pointerEvents = 'all';

options.element.onmousedown = onStart;
options.element.ontouchstart = onStart;
element.onmousedown = onStart;
element.ontouchstart = onStart;

function onStart(e) {
// make dragging and dragged into properties of gd
Expand All @@ -100,29 +102,28 @@ dragElement.init = function init(options) {

if(hasHover) {
dragCover = coverSlip();
dragCover.style.cursor = window.getComputedStyle(options.element).cursor;
dragCover.style.cursor = window.getComputedStyle(element).cursor;
}
else {
// document acts as a dragcover for mobile, bc we can't create dragcover dynamically
dragCover = document;
cursor = window.getComputedStyle(document.documentElement).cursor;
document.documentElement.style.cursor = window.getComputedStyle(options.element).cursor;
document.documentElement.style.cursor = window.getComputedStyle(element).cursor;
}

dragCover.addEventListener('mousemove', onMove);
dragCover.addEventListener('mouseup', onDone);
dragCover.addEventListener('mouseout', onDone);
dragCover.addEventListener('touchmove', onMove);
dragCover.addEventListener('touchend', onDone);
document.addEventListener('mousemove', onMove);
document.addEventListener('mouseup', onDone);
document.addEventListener('touchmove', onMove);
document.addEventListener('touchend', onDone);

return Lib.pauseEvent(e);
}

function onMove(e) {
var offset = pointerOffset(e),
dx = offset[0] - startX,
dy = offset[1] - startY,
minDrag = options.minDrag || constants.MINDRAG;
var offset = pointerOffset(e);
var dx = offset[0] - startX;
var dy = offset[1] - startY;
var minDrag = options.minDrag || constants.MINDRAG;

if(Math.abs(dx) < minDrag) dx = 0;
if(Math.abs(dy) < minDrag) dy = 0;
Expand All @@ -137,11 +138,10 @@ dragElement.init = function init(options) {
}

function onDone(e) {
dragCover.removeEventListener('mousemove', onMove);
dragCover.removeEventListener('mouseup', onDone);
dragCover.removeEventListener('mouseout', onDone);
dragCover.removeEventListener('touchmove', onMove);
dragCover.removeEventListener('touchend', onDone);
document.removeEventListener('mousemove', onMove);
document.removeEventListener('mouseup', onDone);
document.removeEventListener('touchmove', onMove);
document.removeEventListener('touchend', onDone);

if(hasHover) {
Lib.removeElement(dragCover);
Expand Down
6 changes: 3 additions & 3 deletions test/jasmine/tests/dragelement_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('dragElement', function() {
expect(args[2]).toBe(true);
});

it('should pass dragged and numClicks to doneFn on mouseup & mouseout', function() {
it('should pass dragged and numClicks to doneFn on mouseup', function() {
var args = [];
var options = {
element: this.element,
Expand All @@ -96,7 +96,7 @@ describe('dragElement', function() {

mouseEvent('mousedown', this.x, this.y);
mouseEvent('mousemove', this.x + 10, this.y + 10);
mouseEvent('mouseout', this.x, this.y);
mouseEvent('mouseup', this.x, this.y);

expect(args[0]).toBe(true);
expect(args[1]).toEqual(2);
Expand All @@ -118,7 +118,7 @@ describe('dragElement', function() {
mouseEvent('mousemove', this.x + 10, this.y + 10);
expect(countCoverSlip()).toEqual(1);

mouseEvent('mouseout', this.x, this.y);
mouseEvent('mouseup', this.x, this.y);
expect(countCoverSlip()).toEqual(0);
});

Expand Down