core: fixed offset method for FF3 - FF3 seems to have problems reporting the correct...

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index b77a0cd..f0adae0 100644 (file)
--- 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
@@ -112,12 +112,14 @@ jQuery.fn.extend({
                        parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
 
                        // Subtract element margins
-                       offset.top  -= parseInt( jQuery.curCSS( this[0], 'marginTop',  true ), 10 ) || 0;
-                       offset.left -= parseInt( jQuery.curCSS( this[0], 'marginLeft', true ), 10 ) || 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 ), 10 ) || 0;
-                       parentOffset.left += parseInt( jQuery.curCSS( offsetParent[0], 'borderLeftWidth', true ), 10 ) || 0;
+                       parentOffset.top  += num( offsetParent, 'borderTopWidth' );
+                       parentOffset.left += num( offsetParent, 'borderLeftWidth' );
 
                        // Subtract the two offsets
                        results = {