Skip to content

Commit

Permalink
Small optimization to offset (thanks Ariel Flesler)
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonaaron committed Apr 21, 2008
1 parent 3e285bd commit 9de35ce
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/offset.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ jQuery.fn.offset = function() {
offsetParent = elem.offsetParent,
doc = elem.ownerDocument,
safari2 = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
fixed = jQuery.css(elem, "position") == "fixed";
css = jQuery.curCSS,
fixed = css(elem, "position") == "fixed";

// Use getBoundingClientRect if available
if ( elem.getBoundingClientRect ) {
Expand Down Expand Up @@ -45,7 +46,7 @@ jQuery.fn.offset = function() {
border( offsetParent );

// Add the document scroll offsets if position is fixed on any offsetParent
if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" )
if ( !fixed && css(offsetParent, "position") == "fixed" )
fixed = true;

// Set offsetChild to previous offsetParent unless it is the body element
Expand All @@ -57,12 +58,12 @@ jQuery.fn.offset = function() {
// Get parent scroll offsets
while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
if ( !/^inline|table.*$/i.test(css(parent, "display")) )
// Subtract parent scroll offsets
add( -parent.scrollLeft, -parent.scrollTop );

// Mozilla does not add the border for a parent that has overflow != visible
if ( mozilla && jQuery.css(parent, "overflow") != "visible" )
if ( mozilla && css(parent, "overflow") != "visible" )
border( parent );

// Get next parent
Expand All @@ -71,8 +72,8 @@ jQuery.fn.offset = function() {

// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) ||
(mozilla && jQuery.css(offsetChild, "position") != "absolute") )
if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) ||
(mozilla && css(offsetChild, "position") != "absolute") )
add( -doc.body.offsetLeft, -doc.body.offsetTop );

// Add the document scroll offsets if position is fixed
Expand Down

0 comments on commit 9de35ce

Please sign in to comment.