Merge branch 'master' of git://github.com/jquery/jquery into fixedbuild

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index a10d30a..18261bb 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -181,10 +181,10 @@ jQuery.offset = {
                        curOffset = curElem.offset(),
                        curCSSTop = jQuery.css( elem, "top" ),
                        curCSSLeft = jQuery.css( elem, "left" ),
-                       calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+                       calculatePosition = ((position === "absolute" || position === "fixed") && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
                        props = {}, curPosition = {}, curTop, curLeft;
 
-               // need to be able to calculate position if either top or left is auto and position is absolute
+               // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
                if ( calculatePosition ) {
                        curPosition = curElem.position();
                }
@@ -275,7 +275,7 @@ jQuery.each( ["Left", "Top"], function( i, name ) {
                                if ( win ) {
                                        win.scrollTo(
                                                !i ? val : jQuery(win).scrollLeft(),
-                                                i ? val : jQuery(win).scrollTop()
+                                               i ? val : jQuery(win).scrollTop()
                                        );
 
                                } else {