X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=3c63aae920cf2d2e6292088b03ddb8787b15ad33;hb=8ece9e8fb1278e4e62aeb8896979b2a6815dcb3e;hp=6289ad29320be3c07e295fbffa80f8dfdada84c6;hpb=28ee5c692245e18bdedcc91372949ec8b784ee36;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 6289ad2..3c63aae 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,12 +1,15 @@
+// The Offset Method
+// Originally By Brandon Aaron, part of the Dimension Plugin
+// http://jquery.com/plugins/project/dimensions
 jQuery.fn.offset = function() {
 	var left = 0, top = 0, elem = this[0], results;
 	
 	if ( elem ) with ( jQuery.browser ) {
-		var	absolute	= jQuery.css(elem, "position") == "absolute", 
-		    	parent		= elem.parentNode, 
-		    	offsetParent	= elem.offsetParent, 
-		    	doc		= elem.ownerDocument,
-			safari2		= safari && !absolute && parseInt(version) < 522;
+		var	absolute     = jQuery.css(elem, "position") == "absolute", 
+		    parent       = elem.parentNode, 
+		    offsetParent = elem.offsetParent, 
+		    doc          = elem.ownerDocument,
+		    safari2      = safari && parseInt(version) < 522;
 	
 		// Use getBoundingClientRect if available
 		if ( elem.getBoundingClientRect ) {
@@ -52,9 +55,9 @@ jQuery.fn.offset = function() {
 			}
 		
 			// Get parent scroll offsets
-			while ( parent.tagName && /^body|html$/i.test(parent.tagName) ) {
+			while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
 				// Work around opera inline/table scrollLeft/Top bug
-				if ( /^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
+				if ( !/^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
 					// Subtract parent scroll offsets
 					add( -parent.scrollLeft, -parent.scrollTop );
 			
@@ -67,7 +70,7 @@ jQuery.fn.offset = function() {
 			}
 		
 			// Safari doubles body offsets with an absolutely positioned element or parent
-			if ( safari && absolute )
+			if ( safari2 && absolute )
 				add( -doc.body.offsetLeft, -doc.body.offsetTop );
 		}