Skip to content

Commit f4fbbf9

Browse files
committed
Don't fire draggable:end if draggable:start has not been fired
1 parent 92bacff commit f4fbbf9

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

ngDraggable.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,21 +211,25 @@ angular.module("ngDraggable", [])
211211
var onrelease = function(evt) {
212212
if (!_dragEnabled)
213213
return;
214+
215+
$document.off(_moveEvents, onmove);
216+
$document.off(_releaseEvents, onrelease);
217+
_deregisterRootMoveListener();
218+
219+
if (!element.hasClass('dragging'))
220+
return;
221+
214222
evt.preventDefault();
215223
$rootScope.$broadcast('draggable:end', {x:_mx, y:_my, tx:_tx, ty:_ty, event:evt, element:element, data:_data, callback:onDragComplete, uid: _myid});
216224
element.removeClass('dragging');
217225
element.parent().find('.drag-enter').removeClass('drag-enter');
218226
reset();
219-
$document.off(_moveEvents, onmove);
220-
$document.off(_releaseEvents, onrelease);
221227

222228
if (onDragStopCallback ){
223229
scope.$apply(function () {
224230
onDragStopCallback(scope, {$data: _data, $event: evt});
225231
});
226232
}
227-
228-
_deregisterRootMoveListener();
229233
};
230234

231235
var onDragComplete = function(evt) {

0 commit comments

Comments
 (0)