Changeset 4602

Timestamp:

02/03/08 17:12:15 (7 months ago)

Author:

paul.bakaus

Message:

fixed comma issue, speeded up sortables a bit

Files:

• trunk/ui/ui.sortable.js (modified) (3 diffs)

trunk/ui/ui.sortable.js

@@ -16 +16 @@
                     new $.ui.sortable(this, options);
             });
-        },
+        }
     });
     
@@ -143 +143 @@
 
         },
-        refreshPositions: function() {
+        refreshPositions: function(fast) {
             for (var i = this.items.length - 1; i >= 0; i--){
-                this.items[i].width = this.items[i].item.outerWidth();
-                this.items[i].height = this.items[i].item.outerHeight();
+                if(!fast) this.items[i].width = this.items[i].item.outerWidth();
+                if(!fast) this.items[i].height = this.items[i].item.outerHeight();
                 var p = this.items[i].item.offset();
                 this.items[i].left = p.left;
@@ -264 +264 @@
             //Rearrange
             for (var i = this.items.length - 1; i >= 0; i--) {
-                if(this.intersectsWith(this.items[i]) && this.items[i].item[0] != this.currentItem[0] && !this.currentItem[0].contains(this.items[i].item[0])) {
+                if(this.intersectsWith(this.items[i]) && this.items[i].item[0] != this.currentItem[0] && (this.options.tree ? !this.currentItem[0].contains(this.items[i].item[0]) : true)) {
                     //Rearrange the DOM
                     this.items[i].item[this.direction == 'down' ? 'before' : 'after'](this.currentItem);
-                    this.refreshPositions(); //Precompute after each DOM insertion, NOT on mousemove
+                    this.refreshPositions(true); //Precompute after each DOM insertion, NOT on mousemove
                     if(this.placeholderElement) this.placeholder.css(this.placeholderElement.offset());
                     this.propagate("change", e); //Call plugins and callbacks