library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sortable: Make sure we have a placeholder before trying to remove it during a cancel. Fixes #6879 - Sortable: Calling cancel when there is no sort occurring throws an error.

Browse Source 
(cherry picked from commit f165c93127)
This commit is contained in:
marcos.sousa 2011-01-18 16:33:30 -02:00 committed by Scott González
parent 465c4c2cbe
commit 1ce8cf885f
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/jquery.ui.sortable.js vendored
View File

@ -378,21 +378,23 @@ $.widget("ui.sortable", $.ui.mouse, {
} }
//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node! if (this.placeholder) {
if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]); //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove(); if(this.placeholder[0].parentNode) this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
if(this.options.helper != "original" && this.helper && this.helper[0].parentNode) this.helper.remove();
$.extend(this, { $.extend(this, {
helper: null, helper: null,
dragging: false, dragging: false,
reverting: false, reverting: false,
_noFinalSort: null _noFinalSort: null
}); });
if(this.domPosition.prev) { if(this.domPosition.prev) {
$(this.domPosition.prev).after(this.currentItem); $(this.domPosition.prev).after(this.currentItem);
} else { } else {
$(this.domPosition.parent).prepend(this.currentItem); $(this.domPosition.parent).prepend(this.currentItem);
}
} }
return this; return this;