Skip to content
This repository has been archived by the owner on Jun 18, 2018. It is now read-only.

Use manager.context instead of window for establishing subscriptions #59

Closed
wants to merge 2 commits into from
Closed

Use manager.context instead of window for establishing subscriptions #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
457b5d7
Use manager.context instead of window for establishing subscriptions
darthtrevino Jan 17, 2017
1965bd4
Install the isSetUp flag into the window instead of the constructor t…
darthtrevino Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/HTML5Backend.js
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@ export default class HTML5Backend {
this.actions = manager.getActions();
this.monitor = manager.getMonitor();
this.registry = manager.getRegistry();
this.window = manager.getContext();

this.sourcePreviewNodes = {};
this.sourcePreviewNodeOptions = {};
Expand All @@ -35,24 +36,24 @@ export default class HTML5Backend {
}

setup() {
if (typeof window === 'undefined') {
if (typeof this.window === 'undefined') {
return;
}

if (this.constructor.isSetUp) {
if (this.window.__isReactDndBackendSetUp) {
throw new Error('Cannot have two HTML5 backends at the same time.');
}
this.constructor.isSetUp = true;
this.addEventListeners(window);
this.window.__isReactDndBackendSetUp = true;
this.addEventListeners(this.window);
}

teardown() {
if (typeof window === 'undefined') {
if (typeof this.window === 'undefined') {
return;
}

this.constructor.isSetUp = false;
this.removeEventListeners(window);
this.window.__isReactDndBackendSetUp = false;
this.removeEventListeners(this.window);
this.clearCurrentDragSourceNode();
}

Expand Down Expand Up @@ -180,7 +181,7 @@ export default class HTML5Backend {
// On Firefox, if mousemove fires, the drag is over but browser failed to tell us.
// This is not true for other browsers.
if (isFirefox()) {
window.addEventListener('mousemove', this.endDragNativeItem, true);
this.window.addEventListener('mousemove', this.endDragNativeItem, true);
}
}

Expand All @@ -190,7 +191,7 @@ export default class HTML5Backend {
}

if (isFirefox()) {
window.removeEventListener('mousemove', this.endDragNativeItem, true);
this.window.removeEventListener('mousemove', this.endDragNativeItem, true);
}

this.actions.endDrag();
Expand Down Expand Up @@ -219,15 +220,15 @@ export default class HTML5Backend {
// Receiving a mouse event in the middle of a dragging operation
// means it has ended and the drag source node disappeared from DOM,
// so the browser didn't dispatch the dragend event.
window.addEventListener('mousemove', this.endDragIfSourceWasRemovedFromDOM, true);
this.window.addEventListener('mousemove', this.endDragIfSourceWasRemovedFromDOM, true);
}

clearCurrentDragSourceNode() {
if (this.currentDragSourceNode) {
this.currentDragSourceNode = null;
this.currentDragSourceNodeOffset = null;
this.currentDragSourceNodeOffsetChanged = false;
window.removeEventListener('mousemove', this.endDragIfSourceWasRemovedFromDOM, true);
this.window.removeEventListener('mousemove', this.endDragIfSourceWasRemovedFromDOM, true);
return true;
}

Expand Down