X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=ef999d8a460f7620c3284f2c6c91a6e0a62a553b;hb=82ba3709eec42dd8da33eb2023fda927166260eb;hp=1add61c9d2cc37fac6840493bc7f861832514246;hpb=ac324c97e319c8a107036e7ce98dff6e5f78a8ba;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 1add61c..ef999d8 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -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;
@@ -107,11 +107,13 @@ jQuery.fn.extend({
 			// Get *real* offsetParent
 			var offsetParent = this.offsetParent(),
 
-				// Get correct offsets
-				offset       = this.offset(),				
-				parentOffset = offsetParent.offset();
+			// Get correct offsets
+			offset       = this.offset(),
+			parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
 
 			// Subtract element margins
+			// 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' );
 
@@ -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 ];
 	};
 });