diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2011-03-31 10:25:59 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-03-31 10:25:59 -0400 |
| commit | ff06d411d2569a3464fee7dda0580ee60f834b70 (patch) | |
| tree | d31c1187e7c6000c30ebb31cca13c82717d3f739 /src | |
| parent | 459bd7f89d112dd6aec97bfd1923bb7d4337243c (diff) | |
| parent | f9cc5597a47e8a95b13fa5599e94c20fe80903e0 (diff) | |
| download | jquery-ff06d411d2569a3464fee7dda0580ee60f834b70.tar.gz jquery-ff06d411d2569a3464fee7dda0580ee60f834b70.zip | |
Merge branch 'bug_8316' of https://github.com/timmywil/jquery into timmywil-bug_8316
Diffstat (limited to 'src')
| -rw-r--r-- | src/offset.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/offset.js b/src/offset.js index 972278c8d..a0cd7a156 100644 --- a/src/offset.js +++ b/src/offset.js @@ -37,8 +37,8 @@ if ( "getBoundingClientRect" in document.documentElement ) { win = getWindow(doc), clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0, - scrollTop = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop ), - scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft), + scrollTop = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop, + scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft, top = box.top + scrollTop - clientTop, left = box.left + scrollLeft - clientLeft; @@ -180,7 +180,7 @@ jQuery.offset = { curOffset = curElem.offset(), curCSSTop = jQuery.css( elem, "top" ), curCSSLeft = jQuery.css( elem, "left" ), - calculatePosition = ((position === "absolute" || position === "fixed") && 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 either absolute or fixed |