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

diff --git a/event/event.js b/event/event.js
index 05247bc..5511b35 100644
--- a/event/event.js
+++ b/event/event.js
@@ -1,79 +1,117 @@
-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]);
-		}); };
+(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]);
+			}); };
 		
-		// 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) {
-			var p = ( e.fromElement != null ? e.fromElement : e.relatedTarget );
-			while ( p && p != obj ) p = p.parentNode;
-			if ( p == obj ) return false;
+		$.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) {
-			var p = ( e.toElement != null ? e.toElement : e.relatedTarget );
-			while ( p && p != obj ) p = p.parentNode;
-			if ( p == obj ) return false;
+		$.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; }
 			return $.apply(obj,g,[e]);
 		});
 	});
 };
 
-// Deprecated
-$.fn.onhover = $.fn.hover;
+$.$$isReady = false;
+$.$$ready = [];
 
+// Handle when the DOM is ready
 $.ready = function() {
-  if ( $.$$timer ) {
-	  clearInterval( $.$$timer );
-	  $.$$timer = null;
-	  for ( var i = 0; i < $.$$ready.length; i++ )
-		  $.apply( document, $.$$ready[i] );
-	  $.$$ready = null;
-  }
+	$.$$isReady = true;
+	if ( $.$$ready ) {
+		for ( var i = 0; i < $.$$ready.length; i++ ) {
+			$.apply( document, $.$$ready[i] );
+		}
+		$.$$ready = [];
+	}
 };
 
-if ( document.addEventListener )
+// If Mozilla is used
+if ( $.browser == "mozilla" ) {
+	// Use the handy event callback
 	document.addEventListener( "DOMContentLoaded", $.ready, null );
 
-addEvent( window, "load", $.ready );
+// 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){
@@ -81,4 +119,4 @@ $.fn.toggle = function(a,b) {
 		e.preventDefault();
 		return $.apply( this, this.$$last, [e] ) || false;
 	}) : this._toggle();
-};
\ No newline at end of file
+};