Added more unit tests for offset. Fixed an offset issue relating to table header...

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index 895214a..2570358 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -5,7 +5,7 @@ jQuery.fn.offset = function() {
        var left = 0, top = 0, elem = this[0], results;
        
        if ( elem ) with ( jQuery.browser ) {
-               var     parent       = elem.parentNode, 
+               var parent       = elem.parentNode, 
                    offsetChild  = elem,
                    offsetParent = elem.offsetParent, 
                    doc          = elem.ownerDocument,
@@ -17,26 +17,23 @@ jQuery.fn.offset = function() {
                        var box = elem.getBoundingClientRect();
                
                        // Add the document scroll offsets
-                       add(
-                               box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-                               box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop)
-                       );
+                       add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
+                               box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
                
                        // IE adds the HTML element's border, by default it is medium which is 2px
-                       // IE 6 and IE 7 quirks mode the border width is overwritable by the following css html { border: 0; }
+                       // IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
                        // IE 7 standards mode, the border is always 2px
-                       if ( msie ) {
-                               var border = jQuery("html").css("borderWidth");
-                               border = (border == "medium" || jQuery.boxModel && parseInt(version) >= 7) && 2 || border;
-                               add( -border, -border );
-                       }
+                       // This border/offset is typically represented by the clientLeft and clientTop properties
+                       // However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
+                       // Therefore this method will be off by 2px in IE while in quirksmode
+                       add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
        
                // Otherwise loop through the offsetParents and parentNodes
                } else {
                
                        // Initial element offsets
                        add( elem.offsetLeft, elem.offsetTop );
-               
+                       
                        // Get parent offsets
                        while ( offsetParent ) {
                                // Add offsetParent offsets
@@ -59,8 +56,8 @@ jQuery.fn.offset = function() {
                
                        // Get parent scroll offsets
                        while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
-                               // Remove parent scroll UNLESS that parent is inline or a table-row to work around Opera inline/table scrollLeft/Top bug
-                               if ( !/^inline|table-row.*$/i.test(jQuery.css(parent, "display")) )
+                               // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
+                               if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) )
                                        // Subtract parent scroll offsets
                                        add( -parent.scrollLeft, -parent.scrollTop );
                        
@@ -80,10 +77,8 @@ jQuery.fn.offset = function() {
                        
                        // 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)
-                               );
+                               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