jQuery UI Development

Timestamp:

12/11/08 03:18:28 (8 months ago)

Author:

paul.bakaus

Message:

sortable: fixed containment issue (with 'parent', height was miscalculated due to wrong append order)

Files:

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

trunk/ui/ui.sortable.js

@@ -135 +135 @@
                 this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
 
+                //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+                if(this.helper[0] != this.currentItem[0]) {
+                        this.currentItem.hide();
+                }
+
+                //Create the placeholder
+                this._createPlaceholder();
+                
                 //Set a containment if given in the options
                 if(o.containment)
                         this._setContainment();
-
-                //If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
-                if(this.helper[0] != this.currentItem[0]) {
-                        this.currentItem.hide();
-                }
-
-                //Create the placeholder
-                this._createPlaceholder();
 
                 //Call plugins and callbacks
@@ -703 +703 @@
                         0 - this.offset.relative.left - this.offset.parent.left,
                         0 - this.offset.relative.top - this.offset.parent.top,
-                        $(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
-                        ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
+                        $(o.containment == 'document' ? document : window).width() - this.offset.relative.left - this.offset.parent.left - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
+                        ($(o.containment == 'document' ? document : window).height() || document.body.parentNode.scrollHeight) - this.offset.relative.top - this.offset.parent.top - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
                 ];
 
@@ -715 +715 @@
                                 co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left,
                                 co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top,
-                                co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
-                                co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
+                                co.left + (over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.relative.left - this.offset.parent.left - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
+                                co.top + (over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.relative.top - this.offset.parent.top - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
                         ];
                 }
@@ -775 +775 @@
                         if(position.left < this.containment[0]) position.left = this.containment[0];
                         if(position.top < this.containment[1]) position.top = this.containment[1];
-                        if(position.left > this.containment[2]) position.left = this.containment[2];
-                        if(position.top > this.containment[3]) position.top = this.containment[3];
+                        if(position.left + this.helperProportions.width > this.containment[2]) position.left = this.containment[2] - this.helperProportions.width;
+                        if(position.top + this.helperProportions.height > this.containment[3]) position.top = this.containment[3] - this.helperProportions.height;
                 }