X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=919dbf8e0c741054e74d8c713beed01e71d0a5e2;hb=ee2efbe1e39d32d4ec3a1598f66044e59474c708;hp=3fba15866f62583b3163e6e54a67d8bed7f18c6a;hpb=3a4e1233aa2acabee0d0267d54c2d1112fbdcad4;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 3fba158..919dbf8 100644
--- a/src/event.js
+++ b/src/event.js
@@ -155,6 +155,9 @@ jQuery.event = {
 			if ( evt )
 				data.unshift( this.fix({ type: type, target: element }) );
 
+			// Enforce the right trigger type
+			data[0].type = type;
+
 			// Trigger the event
 			if ( jQuery.isFunction( jQuery.data(element, "handle") ) )
 				val = jQuery.data(element, "handle").apply( element, data );
@@ -263,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
@@ -399,10 +402,6 @@ jQuery.extend({
 			// Remove event listener to avoid memory leak
 			if ( jQuery.browser.mozilla || jQuery.browser.opera )
 				document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
-			
-			// Remove script element used by IE hack
-			if( !window.frames.length ) // don't remove if frames are present (#1187)
-				jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
 		}
 	}
 });
@@ -429,43 +428,22 @@ function bindReady(){
 		// Use the handy event callback
 		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
 	
-	// If IE is used, use the excellent hack by Matthias Miller
-	// http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited
-	else if ( jQuery.browser.msie ) {
-	
-		// Only works if you document.write() it
-		document.write("<scr" + "ipt id=__ie_init defer=true " + 
-			"src=//:><\/script>");
-	
-		// Use the defer script hack
-		var script = document.getElementById("__ie_init");
-		
-		// script does not exist if jQuery is loaded dynamically
-		if ( script ) 
-			script.onreadystatechange = function() {
-				if ( this.readyState != "complete" ) return;
-				jQuery.ready();
-			};
-	
-		// Clear from memory
-		script = null;
-	
-	// If Safari  is used
-	} else if ( jQuery.browser.safari )
-		// Continually check to see if the document.readyState is valid
-		jQuery.safariTimer = setInterval(function(){
-			// loaded and complete are both valid states
-			if ( document.readyState == "loaded" || 
-				document.readyState == "complete" ) {
-	
-				// If either one are found, remove the timer
-				clearInterval( jQuery.safariTimer );
-				jQuery.safariTimer = null;
+	// If Safari or IE is used
+	else
+		// Continually check to see if the document is ready
+		(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 ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" )
+					document.firstChild.doScroll("left");
 	
 				// and execute any waiting functions
 				jQuery.ready();
+			} catch( error ) {
+				setTimeout( timer, 0 );
 			}
-		}, 10); 
+		})();
 
 	// A fallback to window.onload, that will always work
 	jQuery.event.add( window, "load", jQuery.ready );