Merge pull request #110 from ryantehbaker/master

fixes #108
fatlinesofcode · Mar 31, 2015 · 51fd11f · 51fd11f
2 parents bb0b719 + d401b30
commit 51fd11f
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/ngDraggable.js b/ngDraggable.js
@@ -98,11 +98,6 @@ angular.module("ngDraggable", [])
                     var onpress = function(evt) {
                         if(! _dragEnabled)return;
 
-                        // disable drag on clickable element
-                        if (isClickableElement(evt)) {
-                            return;
-                        }
-
                         if(_hasTouch){
                             cancelPress();
                             _pressTimer = setTimeout(function(){
@@ -126,7 +121,6 @@ angular.module("ngDraggable", [])
                     var onlongpress = function(evt) {
                         if(! _dragEnabled)return;
                         evt.preventDefault();
-                        element.addClass('dragging');
 
                         offset = element[0].getBoundingClientRect();
                         if(allowTransform)
@@ -160,13 +154,17 @@ angular.module("ngDraggable", [])
                         _deregisterRootMoveListener = $rootScope.$on('draggable:_triggerHandlerMove', function(event, origEvent) {
                             onmove(origEvent);
                         });
-                        $rootScope.$broadcast('draggable:start', {x:_mx, y:_my, tx:_tx, ty:_ty, event:evt, element:element, data:_data});
                     };
 
                     var onmove = function (evt) {
                         if (!_dragEnabled)return;
                         evt.preventDefault();
 
+                        if (!element.hasClass('dragging')) {
+                            element.addClass('dragging');
+                            $rootScope.$broadcast('draggable:start', {x:_mx, y:_my, tx:_tx, ty:_ty, event:evt, element:element, data:_data});
+                        }
+
                         _mx = ngDraggable.inputEvent(evt).pageX;//ngDraggable.getEventProp(evt, 'pageX');
                         _my = ngDraggable.inputEvent(evt).pageY;//ngDraggable.getEventProp(evt, 'pageY');