Merge pull request #132 from makeitdoit/master

brought back the 'isClickableElement' check on drag to make ng-cancel-dr...
fatlinesofcode · Apr 17, 2015 · 768cd51 · 768cd51
2 parents b444c77 + 859851a
commit 768cd51
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ngDraggable.js b/ngDraggable.js
@@ -64,7 +64,7 @@ angular.module("ngDraggable", [])
                             _dragHandle.on(_pressEvents, onpress);
                         } else {
                             // no handle(s) specified, use the element as the handle
-                            element.on(_pressEvents, onpress);    
+                            element.on(_pressEvents, onpress);
                         }
                         if(! _hasTouch && element[0].nodeName.toLowerCase() == "img"){
                             element.on('mousedown', function(){ return false;}); // prevent native drag for images
@@ -98,6 +98,10 @@ angular.module("ngDraggable", [])
                     var onpress = function(evt) {
                         if(! _dragEnabled)return;
 
+                        if (isClickableElement(evt)) {
+                            return;
+                        }
+
                         if(_hasTouch){
                             cancelPress();
                             _pressTimer = setTimeout(function(){