X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=1ae3f2e2fe157ff558e3afc691e14cffd8632308;hb=c66aa570299459ea948eb123a442da6e22a9611b;hp=4de37a0ba3de65d264eef38403d8ffaffb280f60;hpb=3f5ff3097c315456fe92c9b1e4578590e1eb8648;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 4de37a0..1ae3f2e 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -14,7 +14,7 @@ jQuery.fn.offset = function() {
 		    fixed        = css(elem, "position") == "fixed";
 
 		// Use getBoundingClientRect if available
-		if ( elem.getBoundingClientRect ) {
+		if ( !(mozilla && elem == document.body) && elem.getBoundingClientRect ) {
 			var box = elem.getBoundingClientRect();
 
 			// Add the document scroll offsets
@@ -91,8 +91,8 @@ jQuery.fn.offset = function() {
 	}
 
 	function add(l, t) {
-		left += parseInt(l) || 0;
-		top += parseInt(t) || 0;
+		left += parseInt(l, 10) || 0;
+		top += parseInt(t, 10) || 0;
 	}
 
 	return results;
@@ -101,23 +101,25 @@ jQuery.fn.offset = function() {
 
 jQuery.fn.extend({
 	position: function() {
-		var left = 0, top = 0, elem = this[0], offset, parentOffset, offsetParent, results;
+		var left = 0, top = 0, results;
 
-		if (elem) {
+		if ( this[0] ) {
 			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
+			var offsetParent = this.offsetParent(),
 
 			// Get correct offsets
-			offset       = this.offset();
-			parentOffset = offsetParent.offset();
+			offset       = this.offset(),
+			parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
 
 			// Subtract element margins
-			offset.top  -= parseInt( jQuery.curCSS(elem, 'marginTop', true) ) || 0;
-			offset.left -= parseInt( jQuery.curCSS(elem, 'marginLeft', true) ) || 0;
+			// note: when an element has margin: auto the offsetLeft and marginLeft 
+			// are the same in Safari causing offset.left to incorrectly be 0
+			offset.top  -= num( this, 'marginTop' );
+			offset.left -= num( this, 'marginLeft' );
 
 			// Add offsetParent borders
-			parentOffset.top  += parseInt( jQuery.curCSS(offsetParent[0], 'borderTopWidth', true) ) || 0;
-			parentOffset.left += parseInt( jQuery.curCSS(offsetParent[0], 'borderLeftWidth', true) ) || 0;
+			parentOffset.top  += num( offsetParent, 'borderTopWidth' );
+			parentOffset.left += num( offsetParent, 'borderLeftWidth' );
 
 			// Subtract the two offsets
 			results = {
@@ -130,7 +132,7 @@ jQuery.fn.extend({
 	},
 
 	offsetParent: function() {
-		var offsetParent = this[0].offsetParent;
+		var offsetParent = this[0].offsetParent || document.body;
 		while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
 			offsetParent = offsetParent.offsetParent;
 		return jQuery(offsetParent);
@@ -140,7 +142,9 @@ jQuery.fn.extend({
 
 // Create scrollLeft and scrollTop methods
 jQuery.each( ['Left', 'Top'], function(i, name) {
-	jQuery.fn[ 'scroll' + name ] = function(val) {
+	var method = 'scroll' + name;
+	
+	jQuery.fn[ method ] = function(val) {
 		if (!this[0]) return;
 
 		return val != undefined ?
@@ -149,17 +153,17 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
 			this.each(function() {
 				this == window || this == document ?
 					window.scrollTo(
-						name == 'Left' ? val : jQuery(window)[ 'scrollLeft' ](),
-						name == 'Top'  ? val : jQuery(window)[ 'scrollTop'  ]()
+						!i ? val : jQuery(window).scrollLeft(),
+						 i ? val : jQuery(window).scrollTop()
 					) :
-					this[ 'scroll' + name ] = val;
+					this[ method ] = val;
 			}) :
 
 			// Return the scroll offset
 			this[0] == window || this[0] == document ?
-				self[ (name == 'Left' ? 'pageXOffset' : 'pageYOffset') ] ||
-					jQuery.boxModel && document.documentElement[ 'scroll' + name ] ||
-					document.body[ 'scroll' + name ] :
-				this[0][ 'scroll' + name ];
+				self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+					jQuery.boxModel && document.documentElement[ method ] ||
+					document.body[ method ] :
+				this[0][ method ];
 	};
 });