diff options
| author | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-02-13 13:28:20 +0000 |
|---|---|---|
| committer | Paul Bakaus <paul.bakaus@googlemail.com> | 2009-02-13 13:28:20 +0000 |
| commit | 64b66a4d818ebecc928fcff2d2639a5a44af84a2 (patch) | |
| tree | bc84678e27c3c41e569fd8fdb12d4fa280de1d4c /ui | |
| parent | 39d164b95e79b4b1e56fe889b95bcce505fe857a (diff) | |
| download | jquery-ui-64b66a4d818ebecc928fcff2d2639a5a44af84a2.tar.gz jquery-ui-64b66a4d818ebecc928fcff2d2639a5a44af84a2.zip | |
sortable: pageX/pageY already do not include scroll offsets in safari, therefore it does not need to be substracted again (fixes #4041)
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/ui.sortable.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js index aaf753245..91560c74e 100644 --- a/ui/ui.sortable.js +++ b/ui/ui.sortable.js @@ -806,13 +806,13 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { pos.top // The absolute mouse position + 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() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod + - ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod) ), left: ( pos.left // The absolute mouse position + 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() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod + - ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod) ) }; @@ -863,14 +863,14 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, { - 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) - + ( this.cssPosition == 'fixed' ? -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) - + ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) + + ($.browser.safari && this.cssPosition == 'fixed' ? 0 : ( this.cssPosition == 'fixed' ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() )) ) }; |