diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2008-06-24 11:47:42 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2008-06-24 11:47:42 +0000 |
| commit | a002680ba96639f0a6c959f25048c3ebac043a10 (patch) | |
| tree | 4022e28c633aeaea0adbe0019fa31944cd014758 /ui/ui.sortable.js | |
| parent | dd584fbe9527c88e6adb40653224143abb6b4961 (diff) | |
| download | jquery-ui-a002680ba96639f0a6c959f25048c3ebac043a10.tar.gz jquery-ui-a002680ba96639f0a6c959f25048c3ebac043a10.zip | |
sortable:fixed #3019, stop being fird too early
Diffstat (limited to 'ui/ui.sortable.js')
| -rw-r--r-- | ui/ui.sortable.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js index c3ce88ef2..2426c81f4 100644 --- a/ui/ui.sortable.js +++ b/ui/ui.sortable.js @@ -519,11 +519,9 @@ $.widget("ui.sortable", $.extend($.ui.mouse, { left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft), top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) }, parseInt(this.options.revert, 10) || 500, function() { - self.propagate("stop", e, null, noPropagation); self.clear(e); }); } else { - this.propagate("stop", e, null, noPropagation); this.clear(e, noPropagation); } @@ -554,10 +552,15 @@ $.widget("ui.sortable", $.extend($.ui.mouse, { } this.dragging = false; - if(this.cancelHelperRemoval) return false; + if(this.cancelHelperRemoval) { + this.propagate("stop", e, null, noPropagation); + return false; + } + $(this.currentItem).css('visibility', ''); if(this.placeholder) this.placeholder.remove(); - this.helper.remove(); + this.helper.remove(); this.helper = null; + this.propagate("stop", e, null, noPropagation); return true; |