deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed some cases where expression, expression was used and shouldn't be.

Browse source
This commit is contained in:
jeresig 2010-03-01 16:26:57 -05:00
parent a18f682012
commit fc08d0ea8d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/offset.js
View file

@ -75,7 +75,8 @@ if ( "getBoundingClientRect" in document.documentElement ) {
left += parseFloat( computedStyle.borderLeftWidth ) || 0; left += parseFloat( computedStyle.borderLeftWidth ) || 0;
} }
prevOffsetParent = offsetParent, offsetParent = elem.offsetParent; prevOffsetParent = offsetParent;
offsetParent = elem.offsetParent;
} }
if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) { if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
@ -116,12 +117,16 @@ jQuery.offset = {
this.doesNotAddBorder = (checkDiv.offsetTop !== 5); this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
this.doesAddBorderForTableAndCells = (td.offsetTop === 5); this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
checkDiv.style.position = "fixed", checkDiv.style.top = "20px"; checkDiv.style.position = "fixed";
checkDiv.style.top = "20px";
// safari subtracts parent border width here which is 5px // safari subtracts parent border width here which is 5px
this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15); this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
checkDiv.style.position = checkDiv.style.top = ""; checkDiv.style.position = checkDiv.style.top = "";
innerDiv.style.overflow = "hidden", innerDiv.style.position = "relative"; innerDiv.style.overflow = "hidden";
innerDiv.style.position = "relative";
this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5); this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop); this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);