X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=event%2Fevent.js;h=5511b351e2e4898c3d27fdf998c49b118fd384d2;hb=dea19250497716bbd6f9128eacaa785a620aafde;hp=feec9ee8c84fd2a1a3a5f0fa40235f973c1cf827;hpb=4986837802a65ced713c2dac2ff7d80e42fd7807;p=jquery.git

diff --git a/event/event.js b/event/event.js
index feec9ee..5511b35 100644
--- a/event/event.js
+++ b/event/event.js
@@ -41,44 +41,77 @@ $.fn.hover = function(f,g) {
 	});
 };
 
-// Deprecated
-$.fn.onhover = $.fn.hover;
+$.$$isReady = false;
+$.$$ready = [];
 
+// Handle when the DOM is ready
 $.ready = function() {
-	if ( $.$$timer ) {
-		clearInterval( $.$$timer );
-		$.$$timer = null;
+	$.$$isReady = true;
+	if ( $.$$ready ) {
 		for ( var i = 0; i < $.$$ready.length; i++ ) {
 			$.apply( document, $.$$ready[i] );
 		}
-		$.$$ready = null;
+		$.$$ready = [];
 	}
 };
 
-if ( document.addEventListener ) {
+// If Mozilla is used
+if ( $.browser == "mozilla" ) {
+	// Use the handy event callback
 	document.addEventListener( "DOMContentLoaded", $.ready, null );
+
+// 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 ( $.browser == "msie" ) {
+
+	// Only works if you document.write() it
+	document.write('<script id="__ie_init" defer="true" ' + 
+		'src="javascript:void 0"><\/script>');
+
+	// Use the defer script hack
+	var script = document.getElementById('__ie_init');
+	script.onreadystatechange = function() {
+		if ( this.readyState == 'complete' ) {
+			$.ready();
+		}
+	};
+
+	// Clear from memory
+	script = null;
+
+// If Safari or Opera is used
+} else {
+	$.$$timer = setInterval(function(){
+                if ( document.readyState == "loaded" || 
+			document.readyState == "complete" ) {
+
+			clearInterval( $.$$timer );
+			$.$$timer = null;
+
+			$.ready();
+		}
+	}, 10);
 }
 
+// A fallback, that will always work, just in case
 $.event.add( window, "load", $.ready );
 
+/**
+ * Bind a function to fire when the DOM is ready.
+ */
 $.fn.ready = function(f) {
-	return this.each(function(){
-		if ( $.$$timer ) {
-			$.$$ready.push( f );
-		} else {
-			var o = this;
-			$.$$ready = [ f ];
-			$.$$timer = setInterval( function(){
-				if ( o && o.getElementsByTagName && o.getElementById && o.body ) {
-					$.ready();
-				}
-			}, 10 );
+	if ( $.$$isReady ) {
+		$.apply( document, f );
+	} else {
+		if ( ! $.$$ready ) {
+			$.$$ready = [];
 		}
-	});
-};
 
-// Deprecated
-$.fn.onready = $.fn.ready;
+		$.$$ready.push( f );
+	}
+
+	return this;
+};
 
 $.fn.toggle = function(a,b) {
 	return a && b ? this.click(function(e){