X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=6b52b6ffbc15fa7086fae3762df86436298c0b7b;hb=d828ff75a45bc1f232e607806c930e98d7256fc6;hp=92eace90744aea84c28f0779322290325fd2db7f;hpb=6a12363f2920f40cc03787e6284a0e7c442dc1ae;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 92eace9..6b52b6f 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,7 +1,7 @@
 if ( "getBoundingClientRect" in document.documentElement )
 	jQuery.fn.offset = function() {
 		var elem = this[0];
-		if ( !elem ) return null;
+		if ( !elem || !elem.ownerDocument ) return null;
 		if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
 		var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
 			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
@@ -12,7 +12,7 @@ if ( "getBoundingClientRect" in document.documentElement )
 else
 	jQuery.fn.offset = function() {
 		var elem = this[0];
-		if ( !elem ) return null;
+		if ( !elem || !elem.ownerDocument ) return null;
 		if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
 		jQuery.offset.initialize();
 
@@ -75,6 +75,8 @@ jQuery.offset = {
 
 		body.removeChild( container );
 		jQuery.offset.initialize = function(){};
+
+		body = container = innerDiv = checkDiv = table = td = null;
 	},
 
 	bodyOffset: function(body) {
@@ -133,32 +135,35 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
 
 	jQuery.fn[ method ] = function(val) {
 		if ( !this[0] ) return null;
-		
-		var elem = this[0], win = ("scrollTo" in elem && elem.document) ? elem :
-			(elem.nodeName === "#document") ? elem.defaultView || elem.parentWindow :
-				false;
-
-		return val !== undefined ?
 
+		if ( val !== undefined ) {
 			// Set the scroll offset
-			this.each(function() {
-				win = ("scrollTo" in this && this.document) ? this : 
-					(this.nodeName === "#document") ? this.defaultView || this.parentWindow :
-						false;
-				
+			return this.each(function() {
+				win = getWindow( this );
+
 				win ?
 					win.scrollTo(
 						!i ? val : jQuery(win).scrollLeft(),
 						 i ? val : jQuery(win).scrollTop()
 					) :
 					this[ method ] = val;
-			}) :
+			});
+		} else {
+			var elem = this[0],
+				win  = getWindow( elem );
 
 			// Return the scroll offset
-			win ?
+			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.nodeName === "#document") ? elem.defaultView || elem.parentWindow :
+				false;
+	}
 });