0.8.1

react-dnd · Feb 18, 2015 · 0a4457c · 0a4457c
1 parent 289ff75
commit 0a4457c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dnd",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "homepage": "https://github.com/gaearon/react-dnd",
   "authors": [
     "Dan Abramov <dan.abramov@me.com>"

diff --git a/dist-modules/backends/HTML5.js b/dist-modules/backends/HTML5.js
@@ -48,7 +48,8 @@ function preventDefaultFileDropAction(e) {
 }
 
 function handleTopDragEnter(e) {
-  preventDefaultFileDropAction(e);
+  // IE requires this to not show a nodrag icon over the container
+  e.preventDefault();
 
   var isFirstEnter = _monitor.enter(e.target);
   if (isFirstEnter && isFileDragDropEvent(e)) {
@@ -132,8 +133,7 @@ var HTML5 = {
     // Mouse event tell us that dragging has ended but `dragend` didn't fire.
     // This may happen if source DOM was removed while dragging.
 
-    window.addEventListener("mousemove", triggerDragEndIfDragSourceWasRemovedFromDOM);
-    window.addEventListener("mousein", triggerDragEndIfDragSourceWasRemovedFromDOM);
+    window.addEventListener("mousemove", triggerDragEndIfDragSourceWasRemovedFromDOM, true);
   },
 
   endDrag: function endDrag(component) {
@@ -142,8 +142,7 @@ var HTML5 = {
     _initialDragTargetRect = null;
     _dragTargetRectDidChange = false;
 
-    window.removeEventListener("mousemove", triggerDragEndIfDragSourceWasRemovedFromDOM);
-    window.removeEventListener("mousein", triggerDragEndIfDragSourceWasRemovedFromDOM);
+    window.removeEventListener("mousemove", triggerDragEndIfDragSourceWasRemovedFromDOM, true);
   },
 
   dragOver: function dragOver(component, e, dropEffect) {

diff --git a/dist-modules/utils/createDragDropMixin.js b/dist-modules/utils/createDragDropMixin.js
@@ -283,6 +283,9 @@ function createDragDropMixin(backend) {
         return;
       }
 
+      // IE requires this to trigger dragOver events
+      e.preventDefault();
+
       var _dropTargets$state$draggedItemType = this._dropTargets[this.state.draggedItemType];
       var enter = _dropTargets$state$draggedItemType.enter;
       var getDropEffect = _dropTargets$state$draggedItemType.getDropEffect;

diff --git a/dist/ReactDND.min.js b/dist/ReactDND.min.js
diff --git a/examples/bundle.js b/examples/bundle.js
diff --git a/examples/bundle.js.map b/examples/bundle.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dnd",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Drag and drop for React with full DOM control",
   "main": "dist-modules/index.js",
   "scripts": {