X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=47758665e95b570aec8ecaa2fa0d9664cd2a453a;hb=beebbf8ba44655f2f90750f727ef9cbdfe152f1c;hp=daa3d2e52401bc10d2bd19c9289dabecbb7979ec;hpb=6e8a8c535974ebada1e5dde9fa380c2c040106ce;p=jquery.git

diff --git a/src/event.js b/src/event.js
index daa3d2e..4775866 100644
--- a/src/event.js
+++ b/src/event.js
@@ -266,8 +266,8 @@ jQuery.event = {
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
 			var e = document.documentElement, b = document.body;
-			event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
-			event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
+			event.pageX = event.clientX + (e && e.scrollLeft || b && b.scrollLeft || 0);
+			event.pageY = event.clientY + (e && e.scrollTop || b && b.scrollTop || 0);
 		}
 			
 		// Add which for key events
@@ -429,21 +429,24 @@ function bindReady(){
 		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
 	
 	// If Safari or IE is used
-	else
+	else {
 		// Continually check to see if the document is ready
-		(function timer() {
+		function timer(){
 			try {
-				// If IE is used, use the excellent hack by Hedger Wang and Andrea Giammarchi
-				// http://www.3site.eu/jstests/onContent/DOMReadyAnddoScroll.php
+				// If IE is used, use the trick by Diego Perini
+				// http://javascript.nwbox.com/IEContentLoaded/
 				if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" )
-					document.firstChild.doScroll("left");
+					document.documentElement.doScroll("left");
 	
 				// and execute any waiting functions
 				jQuery.ready();
 			} catch( error ) {
 				setTimeout( timer, 0 );
 			}
-		})();
+		}
+
+		timer();
+	}
 
 	// A fallback to window.onload, that will always work
 	jQuery.event.add( window, "load", jQuery.ready );