X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=fe649ae3e75abdd8bffe4ae20315c986c779e1d5;hb=96dd06ea50674c77de4a5d953c227bb54d9276af;hp=3f616baa1e9192c48499c4c13b726ef1c38a0da5;hpb=48e9a3999596c2ee1f4470a78637de8f27e3b219;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 3f616ba..fe649ae 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -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) {
@@ -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;
+}