jQuery UI Development

Timestamp:

06/24/08 08:28:12 (21 months ago)

Author:

paul.bakaus

Message:

sortable: connected lists items are not refreshed until you actually move into the connected list - this improves performance for connected lists

Location:

trunk/ui

Files:

• ui.draggable.js (modified) (2 diffs)
• ui.sortable.js (modified) (5 diffs)

trunk/ui/ui.draggable.js

@@ -444 +444 @@
                                         shouldRevert: sortable.options.revert
                                 });
-                                sortable.refresh();     //Do a one-time refresh at start to refresh the containerCache  
+                                sortable.refreshItems();        //Do a one-time refresh at start to refresh the containerCache  
                                 sortable.propagate("activate", e, inst);
                         }
@@ -503 +503 @@
                                 
                                         e.target = this.instance.currentItem[0];
-                                        this.instance.mouseCapture(e, true, true);
+                                        this.instance.mouseCapture(e, true);
                                         this.instance.mouseStart(e, true, true);
+                                        
+                                        console.log(this.instance.items);
 
                                         //Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes

trunk/ui/ui.sortable.js

@@ -173 +173 @@
                                 items.push({
                                         item: $(this),
+                                        instance: queries[i][1],
                                         width: 0, height: 0,
                                         left: 0, top: 0
@@ -191 +192 @@
                 }
 
-                for (var i = this.items.length - 1; i >= 0; i--){
+                for (var i = this.items.length - 1; i >= 0; i--){               
+                        
+                        //We ignore calculating positions of all connected containers when we're not over them
+                        if(this.items[i].instance != this.currentContainer && this.currentContainer && this.items[i].item[0] != this.currentItem[0])
+                                continue;
+                                
                         var t = this.items[i].item;
+                        
                         if(!fast) this.items[i].width = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).outerWidth();
                         if(!fast) this.items[i].height = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).outerHeight();
+                        
                         var p = (this.options.toleranceElement ? $(this.options.toleranceElement, t) : t).offset();
                         this.items[i].left = p.left;
                         this.items[i].top = p.top;
-                };
+                        
+                };
+                
                 for (var i = this.containers.length - 1; i >= 0; i--){
                         var p =this.containers[i].element.offset();
@@ -206 +216 @@
                         this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
                 };
+                
         },
         destroy: function() {
@@ -266 +277 @@
                                                 }
                                                 
-                                                
-                                                itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance) : this.rearrange(e, null, this.containers[i].element);
+                                                this.currentContainer = this.containers[i];
+                                                itemWithLeastDistance ? this.rearrange(e, itemWithLeastDistance, null, true) : this.rearrange(e, null, this.containers[i].element, true);
                                                 this.propagate("change", e); //Call plugins and callbacks
                                                 this.containers[i].propagate("change", e, this); //Call plugins and callbacks
-                                                this.currentContainer = this.containers[i];
 
                                         }
@@ -519 +529 @@
                 
         },
-        rearrange: function(e, i, a) {
+        rearrange: function(e, i, a, hardRefresh) {
                 a ? a.append(this.currentItem) : i.item[this.direction == 'down' ? 'before' : 'after'](this.currentItem);
-                this.refreshPositions(true); //Precompute after each DOM insertion, NOT on mousemove
+                this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
                 if(this.options.placeholder) this.options.placeholder.update.call(this.element, this.currentItem, this.placeholder);
         },