Changeset 12525 for trunk/themes/default/js/ui/jquery.ui.sortable.js

Timestamp:

Oct 28, 2011, 3:25:54 PM (12 years ago)

Author:

patdenice

Message:

feature:2487
Update jQuery to 1.6.4 and jQuery UI to 1.8.16

File:

• trunk/themes/default/js/ui/jquery.ui.sortable.js (modified) (5 diffs)

trunk/themes/default/js/ui/jquery.ui.sortable.js

@@ -1 +1 @@
 /*
- * jQuery UI Sortable 1.8.10
+ * jQuery UI Sortable 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
@@ -50 +50 @@
                 this.refresh();
 
-                //Let's determine if the items are floating
-                this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
+                //Let's determine if the items are being displayed horizontally
+                this.floating = this.items.length ? o.axis === 'x' || (/left|right/).test(this.items[0].item.css('float')) || (/inline|table-cell/).test(this.items[0].item.css('display')) : false;
 
                 //Let's determine the parent's offset
@@ -615 +615 @@
                 for (var i = this.items.length - 1; i >= 0; i--){
                         var item = this.items[i];
+
+                        //We ignore calculating positions of all connected containers when we're not over them
+                        if(item.instance != this.currentContainer && this.currentContainer && item.item[0] != this.currentItem[0])
+                                continue;
 
                         var t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
@@ -981 +985 @@
                 // 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;
 
@@ -1068 +1072 @@
 
 $.extend($.ui.sortable, {
-        version: "1.8.10"
+        version: "1.8.16"
 });