revision 6494 accidentally reverted some changes to offset module

[jquery.git] / src / offset.js

diff --git a/src/offset.js b/src/offset.js
index 6e22ce3..c27dc5a 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -39,7 +39,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                                top += elem.offsetTop;
                                left += elem.offsetLeft;
 
-                               if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) ) {
+                               if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.nodeName)) ) {
                                        top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
                                        left += parseFloat( computedStyle.borderLeftWidth ) || 0;
                                }
@@ -97,7 +97,7 @@ jQuery.offset = {
 
                body.removeChild( container );
                jQuery.offset.initialize = function(){};
-
+               
                body = container = innerDiv = checkDiv = table = td = null;
        },
 
@@ -127,7 +127,7 @@ jQuery.fn.extend({
 
                // Get correct offsets
                offset       = this.offset(),
-               parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
+               parentOffset = /^body|html$/i.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
 
                // Subtract element margins
                // note: when an element has margin: auto the offsetLeft and marginLeft
@@ -149,7 +149,7 @@ jQuery.fn.extend({
        offsetParent: function() {
                return this.map(function(){
                        var offsetParent = this.offsetParent || document.body;
-                       while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') === 'static') ) {
+                       while ( offsetParent && (!/^body|html$/i.test(offsetParent.nodeName) && jQuery.css(offsetParent, 'position') === 'static') ) {
                                offsetParent = offsetParent.offsetParent;
                        }
                        return offsetParent;
@@ -163,40 +163,38 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
        var method = 'scroll' + name;
 
        jQuery.fn[ method ] = function(val) {
-               if ( !this[0] ) { return null; }
+               var elem = this[0], win;
+               
+               if ( !elem ) { return null; }
 
                if ( val !== undefined ) {
                        // Set the scroll offset
                        return this.each(function() {
                                win = getWindow( this );
 
-                               if ( win ) {
+                               win ?
                                        win.scrollTo(
                                                !i ? val : jQuery(win).scrollLeft(),
                                                 i ? val : jQuery(win).scrollTop()
-                                       );
-                               } else {
+                                       ) :
                                        this[ method ] = val;
-                               }
                        });
                } else {
-                       var elem = this[0],
-                               win  = getWindow( elem );
+                       win = getWindow( elem );
 
                        // Return the scroll offset
-                       return win && 'pageXOffset' in win ?
-                               win[ i ? 'pageYOffset' : 'pageXOffset' ] ||
-                                       jQuery.support.boxModel && win.document.documentElement[ method ] ||
+                       return win ? ('pageXOffset' in win) ? win[ i ? 'pageYOffset' : 'pageXOffset' ] :
+                               jQuery.support.boxModel && win.document.documentElement[ method ] ||
                                        win.document.body[ method ] :
                                elem[ method ];
                }
        };
-
-       function getWindow( elem ) {
-               return ("scrollTo" in elem && elem.document) ?
-                       elem :
-                       elem.nodeType === 9 ?
-                               elem.defaultView || elem.parentWindow :
-                               false;
-       }
 });
+
+function getWindow( elem ) {
+       return ("scrollTo" in elem && elem.document) ?
+               elem :
+               elem.nodeType === 9 ?
+                       elem.defaultView || elem.parentWindow :
+                       false;
+}