jQuery UI Development

Timestamp:

12/11/08 05:39:15 (9 months ago)

Author:

paul.bakaus

Message:

sortable,draggable: fixed issues with _convertPositionTo, missed from latest re-factor, miscalculated the absolute position including scroll

Location:

trunk/ui

Files:

• ui.draggable.js (modified) (3 diffs)
• ui.sortable.js (modified) (6 diffs)

trunk/ui/ui.draggable.js

@@ -263 +263 @@
                 if(!pos) pos = this.position;
                 var mod = d == "absolute" ? 1 : -1;
+                var scroll = this[(this.cssPosition == 'absolute' ? 'offset' : 'scroll')+'Parent'], scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
 
                 return {
@@ -269 +270 @@
                                 + this.offset.relative.top      * mod                                                                           // Only for relative positioned nodes: Relative offset from element to offset parent
                                 + this.offset.parent.top * mod                                                                                  // The offsetParent's offset without borders (offset + border)
-                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : this[(this.cssPosition == 'absolute' ? 'offset' : 'scroll')+'Parent'].scrollTop() ) * mod
+                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod
                                 + this.margins.top * mod                                                                                                //Add the margin (you don't want the margin counting in intersection methods)
                         ),
@@ -276 +277 @@
                                 + this.offset.relative.left     * mod                                                                           // Only for relative positioned nodes: Relative offset from element to offset parent
                                 + this.offset.parent.left * mod                                                                                 // The offsetParent's offset without borders (offset + border)
-                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : this[(this.cssPosition == 'absolute' ? 'offset' : 'scroll')+'Parent'].scrollLeft() ) * mod
+                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : ( scrollIsRootNode ? 0 : scroll.scrollLeft() ) ) * mod
                                 + this.margins.left * mod                                                                                               //Add the margin (you don't want the margin counting in intersection methods)
                         )

trunk/ui/ui.sortable.js

@@ -726 +726 @@
                 if(!pos) pos = this.position;
                 var mod = d == "absolute" ? 1 : -1;
+                var scroll = this[(this.cssPosition == 'absolute' ? 'offset' : 'scroll')+'Parent'], scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
 
                 return {
@@ -732 +733 @@
                                 + this.offset.relative.top      * mod                                                                           // Only for relative positioned nodes: Relative offset from element to offset parent
                                 + this.offset.parent.top * mod                                                                                  // The offsetParent's offset without borders (offset + border)
-                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : this[(this.cssPosition == 'absolute' ? 'offset' : 'scroll')+'Parent'].scrollTop() ) * mod
+                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod
                                 + this.margins.top * mod                                                                                                //Add the margin (you don't want the margin counting in intersection methods)
                         ),
@@ -739 +740 @@
                                 + this.offset.relative.left     * mod                                                                           // Only for relative positioned nodes: Relative offset from element to offset parent
                                 + this.offset.parent.left * mod                                                                                 // The offsetParent's offset without borders (offset + border)
-                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : this[(this.cssPosition == 'absolute' ? 'offset' : 'scroll')+'Parent'].scrollLeft() ) * mod
+                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : ( scrollIsRootNode ? 0 : scroll.scrollLeft() ) ) * mod
                                 + this.margins.left * mod                                                                                               //Add the margin (you don't want the margin counting in intersection methods)
                         )
@@ -762 +763 @@
                                 - this.offset.relative.left                                                                                             // Only for relative positioned nodes: Relative offset from element to offset parent
                                 - this.offset.parent.left                                                                                               // The offsetParent's offset without borders (offset + border)
-                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() )
+                                + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : ( scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
                         )
                 };
@@ -940 +941 @@
 $.ui.plugin.add("sortable", "scroll", {
         start: function(event, ui) {
-                var o = ui.options;
-                var i = $(this).data("sortable");
-
+                var i = $(this).data("sortable"), o = i.options;
                 if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
-
-        },
-        drag: function(event, ui) {
-
-                var o = ui.options, scrolled = false;
-                var i = $(this).data("sortable");
+        },
+        sort: function(event, ui) {
+        
+                var i = $(this).data("sortable"), o = i.options, scrolled = false;
 
                 if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {
@@ -977 +974 @@
                 }
 
-                if(scrolled !== false && $.ui.ddmanager)
+                if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour)
                         $.ui.ddmanager.prepareOffsets(i, event);