Push disposables out of the backend

react-dnd · Apr 4, 2015 · 1f74ac8 · 1f74ac8
1 parent f37f5b7
commit 1f74ac8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/modules/backends/HTML5.js b/modules/backends/HTML5.js
@@ -1,5 +1,4 @@
 import { DragSource } from 'dnd-core';
-import { Disposable } from 'rx-lite';
 import NativeTypes from '../NativeTypes';
 import EnterLeaveCounter from '../utils/EnterLeaveCounter';
 import invariant from 'react/lib/invariant';
@@ -398,9 +397,9 @@ export default class HTML5Backend {
   connectSourcePreviewNode(sourceId, node) {
     this.sourcePreviewNodes[sourceId] = node;
 
-    return new Disposable(() => {
+    return () => {
       delete this.sourcePreviewNodes[sourceId];
-    });
+    };
   }
 
   connectSourceNode(sourceId, node) {
@@ -409,10 +408,10 @@ export default class HTML5Backend {
     node.setAttribute('draggable', true);
     node.addEventListener('dragstart', handleDragStart);
 
-    return new Disposable(() => {
+    return () => {
       node.removeEventListener('dragstart', handleDragStart);
       node.setAttribute('draggable', false);
-    });
+    };
   }
 
   connectTargetNode(targetId, node) {
@@ -424,10 +423,10 @@ export default class HTML5Backend {
     node.addEventListener('dragover', handleDragOver);
     node.addEventListener('drop', handleDrop);
 
-    return new Disposable(() => {
+    return () => {
       node.removeEventListener('dragenter', handleDragEnter);
       node.removeEventListener('dragover', handleDragOver);
       node.removeEventListener('drop', handleDrop);
-    });
+    };
   }
 }
diff --git a/modules/configureDragDrop.js b/modules/configureDragDrop.js
@@ -1,5 +1,5 @@
 import React, { Component, PropTypes, findDOMNode } from 'react';
-import { CompositeDisposable, SerialDisposable } from 'rx-lite';
+import { CompositeDisposable, SerialDisposable, Disposable } from 'rx-lite';
 import ComponentDragSource from './ComponentDragSource';
 import ComponentDropTarget from './ComponentDropTarget';
 import shallowEqual from './utils/shallowEqual';
@@ -235,8 +235,8 @@ export default function configureDragDrop(InnerComponent, {
           serialDisposable.setDisposable(null);
 
           if (nextNode) {
-            const nextDisposable = connectBackend(handlerId, nextNode);
-            serialDisposable.setDisposable(nextDisposable);
+            const dispose = connectBackend(handlerId, nextNode);
+            serialDisposable.setDisposable(new Disposable(dispose));
             currentNode = nextNode;
           }
         };