X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Foffset.js;h=a06c36c3835871bf48b18e3031171f3eebe3de24;hb=595d1253653c618a8a112ec09777c294125195d9;hp=674338ecbf0397a75ccc44c56f4990bc33387055;hpb=15a78f8fea8679205bc734ec053ff24ebbfd31c8;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 674338e..a06c36c 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -5,15 +5,17 @@ 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	parent       = elem.parentNode, 
+		    offsetParent = elem.offsetParent, 
+		    doc          = elem.ownerDocument,
+		    safari2      = safari && parseInt(version) < 522,
+		    position     = jQuery.css(elem, "position"),
+		    absolute     = position == "absolute",
+		    fixed        = position == "fixed";
 	
 		// Use getBoundingClientRect if available
 		if ( elem.getBoundingClientRect ) {
-			box = elem.getBoundingClientRect();
+			var box = elem.getBoundingClientRect();
 		
 			// Add the document scroll offsets
 			add(
@@ -45,19 +47,33 @@ jQuery.fn.offset = function() {
 				// However Mozilla adds the border for table cells
 				if ( mozilla && /^t[d|h]$/i.test(parent.tagName) || !safari2 )
 					border( offsetParent );
+					
+				// Get offsetParent's position
+				position = jQuery.css(offsetParent, "position");
 				
 				// Safari <= 2 doubles body offsets with an absolutely positioned element or parent
-				if ( safari2 && !absolute && jQuery.css(offsetParent, "position") == "absolute" )
+				if ( safari2 && !absolute && position == "absolute" )
 					absolute = true;
+				
+				// Opera adds border for fixed, relative and absolute parent elements
+				if (opera && /^fixed|relative|absolute$/i.test(position))
+					add( 
+						-parseInt(jQuery.css(elem, "borderLeftWidth")),
+						-parseInt(jQuery.css(elem, "borderTopWidth"))
+					);
+					
+				// Add the document scroll offsets if position is fixed
+				if ( !fixed && position == "fixed" )
+					fixed = true;
 			
 				// Get next offsetParent
 				offsetParent = offsetParent.offsetParent;
 			}
 		
 			// 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 );
 			
@@ -69,9 +85,16 @@ jQuery.fn.offset = function() {
 				parent = parent.parentNode;
 			}
 		
-			// Safari doubles body offsets with an absolutely positioned element or parent
-			if ( safari && absolute )
+			// Safari <= 2 doubles body offsets with an absolute or fixed positioned element or parent
+			if ( safari2 && (absolute || fixed) )
 				add( -doc.body.offsetLeft, -doc.body.offsetTop );
+			
+			// Add the document scroll offsets if position is fixed
+			if ( fixed )
+				add(
+					Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+					Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
+				);
 		}
 
 		// Return an object with top and left properties
@@ -86,6 +109,6 @@ jQuery.fn.offset = function() {
 
 	function add(l, t) {
 		left += parseInt(l) || 0;
-		top += parseInt(t) || 0;
+		top  += parseInt(t) || 0;
 	}
 };