r2076 - trunk/ui

r2076 - trunk/ui


Author: paul.bakaus
Date: Fri Feb 13 05:05:24 2009
New Revision: 2076
Modified:
trunk/ui/ui.draggable.js
Log:
draggable: pageX/pageY already do not include scroll offsets in safari,
therefore it does not need to be substracted again (fixes #4142) (only if
css position is fixed) (removed redundant check)
Modified: trunk/ui/ui.draggable.js
==============================================================================
--- trunk/ui/ui.draggable.js    (original)
+++ trunk/ui/ui.draggable.js    Fri Feb 13 05:05:24 2009
@@ -356,14 +356,14 @@
                - this.offset.click.top                                                    // Click offset (relative to the
element)
                - this.offset.relative.top                                                // Only for relative positioned
nodes: Relative offset from element to offset parent
                - this.offset.parent.top                                                // The offsetParent's offset
without borders (offset + border)
-                + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : (
this.cssPosition == 'fixed' && !$.browser.safari ?
-this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 :
scroll.scrollTop() ) ))
+                + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : (
this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : (
scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
            ),
            left: (
                pageX                                                                // The absolute mouse position
                - this.offset.click.left                                                // Click offset (relative to the
element)
                - 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)
-                + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : (
this.cssPosition == 'fixed' && !$.browser.safari ?
-this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 :
scroll.scrollLeft() ))
+                + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : (
this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() :
scrollIsRootNode ? 0 : scroll.scrollLeft() ))
            )
        };