X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=8ee5680deb287c35bf8669c2a903fdb441381454;hb=6c81082a6b20880cbd5d35ec5c50d4270f3af2ce;hp=11a187eedee51391cebb9c7f6862519439184045;hpb=d7f5a0835bc463d15a4f6210e48110054a050f0b;p=jquery.git

diff --git a/src/offset.js b/src/offset.js
index 11a187e..8ee5680 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -55,7 +55,7 @@ jQuery.fn.offset = function() {
 			}
 		
 			// Get parent scroll offsets
-			while ( parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
+			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
 				// 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
@@ -86,7 +86,7 @@ jQuery.fn.offset = function() {
 	}
 
 	function border(elem) {
-		add( jQuery.css(elem, "borderLeftWidth"), jQuery.css(elem, "borderTopWidth") );
+		add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
 	}
 
 	function add(l, t) {