#277: * fixed handle & filter

SortableJS · Feb 20, 2015 · 87e336a · 87e336a
1 parent 2d861f8
commit 87e336a
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Sortable.js b/Sortable.js
@@ -275,12 +275,12 @@
 				return; // only left button or enabled
 			}
 
-			if (options.handle) {
-				target = _closest(target, options.handle, el);
-			}
-
 			target = _closest(target, options.draggable, el);
 
+			if (!target) {
+				return;
+			}
+
 			// get the index of the dragged element within its parent
 			oldIndex = _index(target);
 
@@ -308,6 +308,12 @@
 				}
 			}
 
+
+			if (options.handle && !_closest(originalTarget, options.handle, el)) {
+				return;
+			}
+
+
 			// Prepare `dragstart`
 			if (target && !dragEl && (target.parentNode === el)) {
 				tapEvt = evt;