X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=event%2Fevent.js;h=dcc0e884a30c2ac0b861220c6252fd3f6180a158;hb=83c75321619f9968e4373a13aced5f83d4228962;hp=dff2e2eb1dd3c12b6900f6c01f273026f9988748;hpb=d71a85001b0562ed05925e0c5635c3c0a1d52068;p=jquery.git

diff --git a/event/event.js b/event/event.js
index dff2e2e..dcc0e88 100644
--- a/event/event.js
+++ b/event/event.js
@@ -1,36 +1,38 @@
-var e = ["blur","focus","contextmenu","load","resize","scroll","unload",
-	"click","dblclick","mousedown","mouseup","mouseenter","mouseleave",
-	"mousemove","mouseover","mouseout","change","reset","select","submit",
-	"keydown","keypress","keyup","abort","error","ready"];
+(function(){
+	var e = ["blur","focus","contextmenu","load","resize","scroll","unload",
+		"click","dblclick","mousedown","mouseup","mouseenter","mouseleave",
+		"mousemove","mouseover","mouseout","change","reset","select","submit",
+		"keydown","keypress","keyup","abort","error","ready"];
 
-for ( var i = 0; i < e.length; i++ ) {
-	(function(){
-		var o = e[i];
-		$.fn[o] = function(f){ return this.bind(o, f); };
-		$.fn["un"+o] = function(f){ return this.unbind(o, f); };
-		$.fn["do"+o] = function(){ return this.trigger(o); };
-		$.fn["one"+o] = function(f){ return this.bind(o, function(e){
-			if ( this[o+f] !== null ) { return true; }
-			this[o+f]++;
-			return $.apply(this,f,[e]);
-		}); };
+	for ( var i = 0; i < e.length; i++ ) {
+		(function(){
+			var o = e[i];
+			$.fn[o] = function(f){ return this.bind(o, f); };
+			$.fn["un"+o] = function(f){ return this.unbind(o, f); };
+			$.fn["do"+o] = function(){ return this.trigger(o); };
+			$.fn["one"+o] = function(f){ return this.bind(o, function(e){
+				if ( this[o+f] !== null ) { return true; }
+				this[o+f]++;
+				return $.apply(this,f,[e]);
+			}); };
 		
-		// Deprecated
-		//$.fn["on"+o] = function(f){ return this.bind(o, f); };
-	})();
-}
+			// Deprecated
+			//$.fn["on"+o] = function(f){ return this.bind(o, f); };
+		})();
+	}
+})();
 
 $.fn.hover = function(f,g) {
 	// Check if mouse(over|out) are still within the same parent element
 	return this.each(function(){
 		var obj = this;
-		addEvent(this, "mouseover", function(e) {
+		$.event.add(this, "mouseover", function(e) {
 			var p = ( e.fromElement !== null ? e.fromElement : e.relatedTarget );
 			while ( p && p != obj ) { p = p.parentNode; }
 			if ( p == obj ) { return false; }
 			return $.apply(obj,f,[e]);
 		});
-		addEvent(this, "mouseout", function(e) {
+		$.event.add(this, "mouseout", function(e) {
 			var p = ( e.toElement !== null ? e.toElement : e.relatedTarget );
 			while ( p && p != obj ) { p = p.parentNode; }
 			if ( p == obj ) { return false; }
@@ -39,13 +41,23 @@ $.fn.hover = function(f,g) {
 	});
 };
 
-// Deprecated
-$.fn.onhover = $.fn.hover;
-
-$.ready = function() {
+// Handle when the DOM is ready
+$.ready = function(isFinal) {
+	// If the timer was running, stop it
 	if ( $.$$timer ) {
 		clearInterval( $.$$timer );
 		$.$$timer = null;
+	}
+
+	// If the last script to fire was in the body,
+	// we assume that it's trying to do a document.write
+	var s = document.getElementsByTagName("script");
+	s = s[s.length-1].parentNode.nodeName == "HEAD";
+
+	// Only execute if we're doing a sane way, or the window
+	// is loaded, or the final script is in the head
+	// and there's something to execute
+	if ( ( !$.badReady || isFinal || s ) && $.$$ready ) {
 		for ( var i = 0; i < $.$$ready.length; i++ ) {
 			$.apply( document, $.$$ready[i] );
 		}
@@ -53,31 +65,60 @@ $.ready = function() {
 	}
 };
 
-if ( document.addEventListener ) {
+// Based off of:
+// http://linguiste.org/projects/behaviour-DOMContentLoaded/example.html
+
+// If Mozilla is used
+if ( $.browser == "mozilla" ) {
+	// Use the handy event callback
 	document.addEventListener( "DOMContentLoaded", $.ready, null );
+
+// If IE is used
+} else if ( $.browser == "msie" ) {
+	// Use the defer script hack
+	var script = document.createElement('SCRIPT');
+	script.type = 'text/javascript';
+	script.src = 'javascript:$.ready();void(0);';
+	script.defer = true;
+	document.getElementsByTagName('HEAD')[0].appendChild(script);
+	script = null;
+
+// Otherwise, try it the hacky way
+} else {
+	$.badReady = true;
 }
 
-addEvent( window, "load", $.ready );
+// A fallback, that will always work, just in case
+$.event.add( window, "load", function(){
+	$.ready(true);
+});
 
+/**
+ * Bind a function to fire when the DOM is ready.
+ */
 $.fn.ready = function(f) {
 	return this.each(function(){
-		if ( $.$$timer ) {
+		if ( $.$$ready ) {
 			$.$$ready.push( f );
 		} else {
 			var o = this;
 			$.$$ready = [ f ];
-			$.$$timer = setInterval( function(){
-				if ( o && o.getElementsByTagName && o.getElementById && o.body ) {
-					$.ready();
-				}
-			}, 10 );
+
+			// Only do our hacky thing if we don't have the nice
+			// Mozilla or IE ways of doing it	
+			if ( $.$$badReady ) {
+				// The trick is to check for the availability of a couple common
+				// DOM functions, if they exist, assume the DOM is ready
+				$.$$timer = setInterval( function(){
+					if ( o && o.getElementsByTagName && o.getElementById && o.body ) {
+						$.ready();
+					}
+				}, 10 );
+			}
 		}
 	});
 };
 
-// Deprecated
-$.fn.onready = $.fn.ready;
-
 $.fn.toggle = function(a,b) {
 	return a && b ? this.click(function(e){
 		this.$$last = this.$$last == a ? b : a;