github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-11 17:35:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/inukshuk/jquery into inukshuk-master

Browse Source 
Conflicts:
	test/unit/offset.js
This commit is contained in:
jeresig
2011-04-12 00:25:36 -04:00
parent ea6987e078 75655e5758
commit 0d755dff13
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/offset.js
View File

@@ -186,11 +186,13 @@ jQuery.offset = {
// 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();
curTop = curPosition.top;
curLeft = curPosition.left;
} else {
curTop = parseFloat( curCSSTop ) || 0;
curLeft = parseFloat( curCSSLeft ) || 0;
}
curTop = calculatePosition ? curPosition.top : parseInt( curCSSTop, 10 ) || 0;
curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0;
if ( jQuery.isFunction( options ) ) {
options = options.call( elem, i, curOffset );
}