0.9.3

react-dnd · Mar 2, 2015 · 73e44f6 · 73e44f6
1 parent 602023a
commit 73e44f6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dnd",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "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
@@ -10,6 +10,8 @@ var DragDropActionCreators = require("../actions/DragDropActionCreators"),
     shallowEqual = require("react/lib/shallowEqual"),
     isWebkit = require("../utils/isWebkit");
 
+var ELEMENT_NODE = 1;
+
 // Store global state for browser-specific fixes and workarounds
 var _monitor = new EnterLeaveMonitor(),
     _currentDragTarget,
@@ -19,6 +21,14 @@ var _monitor = new EnterLeaveMonitor(),
     _currentDropEffect;
 
 function getElementRect(el) {
+  if (el.nodeType !== ELEMENT_NODE) {
+    el = el.parentElement;
+  }
+
+  if (!el) {
+    return null;
+  }
+
   var rect = el.getBoundingClientRect();
   // Copy so object doesn't get reused
   return { top: rect.top, left: rect.left, width: rect.width, height: rect.height };
@@ -61,7 +71,7 @@ function preventDefaultNativeDropAction(e) {
 
 function handleTopDragStart(e) {
   // If by this time no drag source reacted, tell browser not to drag.
-  if (!DragOperationStore.isDragging()) {
+  if (!isNativeDragDropEvent(e) && !DragOperationStore.isDragging()) {
     e.preventDefault();
   }
 }

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.9.2",
+  "version": "0.9.3",
   "description": "Drag and drop for React with full DOM control",
   "main": "dist-modules/index.js",
   "scripts": {