X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=fe649ae3e75abdd8bffe4ae20315c986c779e1d5;hb=19cd84cf3261ee412a2521df73dcf9d6cfba04a3;hp=6e22ce30e13a2f5953b157374a91ad1c3e618c14;hpb=a3b8ac413f9c55994922c20b39223ab9ae6d1afa;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 6e22ce3..fe649ae 100644
--- 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;
 				}
@@ -96,9 +96,8 @@ jQuery.offset = {
 		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
 
 		body.removeChild( container );
-		jQuery.offset.initialize = function(){};
-
 		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = function(){};
 	},
 
 	bodyOffset: function(body) {
@@ -127,7 +126,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 +148,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 +162,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;
+}