From 91ca65721c2eb32b5dec82cdc5e5e7f81dac329e Mon Sep 17 00:00:00 2001 From: vieron Date: Fri, 25 Oct 2013 20:48:10 +0200 Subject: [PATCH] feat(draggable): Don't start new drag if previous one hasn't stopped Moving 4e6159fb by @atesgoral into draggable.js --- src/jquery.draggable.js | 6 ++++-- src/jquery.gridster.js | 8 -------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js index fb01250973..73a4a9ffde 100644 --- a/src/jquery.draggable.js +++ b/src/jquery.draggable.js @@ -246,8 +246,10 @@ fn.on_dragstart = function(e) { e.preventDefault(); - this.drag_start = true; - this.is_dragging = true; + + if (this.is_dragging) { return this; } + + this.drag_start = this.is_dragging = true; var offset = this.$container.offset(); this.baseX = Math.round(offset.left); this.baseY = Math.round(offset.top); diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js index d1d5b35a08..0e23d08beb 100644 --- a/src/jquery.gridster.js +++ b/src/jquery.gridster.js @@ -661,13 +661,6 @@ offset_left: this.options.widget_margins[0], container_width: this.container_width, start: function(event, ui) { - // Ignore drag start if mouse was released outside screen on a previous drag - if (self.dragging) { - return; - } - - self.dragging = true; - self.$widgets.filter('.player-revert') .removeClass('player-revert'); @@ -680,7 +673,6 @@ self.$el.trigger('gridster:dragstart'); }, stop: function(event, ui) { - self.dragging = false; self.on_stop_drag.call(self, event, ui); self.$el.trigger('gridster:dragstop'); },