aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.sortable.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-06-02 14:06:54 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-06-02 14:06:54 +0200
commitafe0f72945170879571ebaf060a816b39c9871b8 (patch)
tree8892e33dc624fe920c9d2838cac0d82b34e04882 /ui/jquery.ui.sortable.js
parentcfaddbfb2a49fbd7f511d49f6404c7447469c5b0 (diff)
parent27a4fdd8ed4fe7733ea139022c04bd7ef8033cba (diff)
downloadjquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.tar.gz
jquery-ui-afe0f72945170879571ebaf060a816b39c9871b8.zip
Merge branch 'master' into widget-factory-demo
Diffstat (limited to 'ui/jquery.ui.sortable.js')
-rw-r--r--ui/jquery.ui.sortable.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index 78349669a..99798a915 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -15,6 +15,7 @@
(function( $, undefined ) {
$.widget("ui.sortable", $.ui.mouse, {
+ version: "@VERSION",
widgetEventPrefix: "sort",
options: {
appendTo: "parent",
@@ -983,7 +984,7 @@ $.widget("ui.sortable", $.ui.mouse, {
// We first have to update the dom position of the actual currentItem
// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
- if(!this._noFinalSort && this.currentItem[0].parentNode) this.placeholder.before(this.currentItem);
+ if(!this._noFinalSort && this.currentItem.parent().length) this.placeholder.before(this.currentItem);
this._noFinalSort = null;
if(this.helper[0] == this.currentItem[0]) {
@@ -1069,8 +1070,4 @@ $.widget("ui.sortable", $.ui.mouse, {
});
-$.extend($.ui.sortable, {
- version: "@VERSION"
-});
-
})(jQuery);