X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=39ec527ce08284b0409f0b86b9ff61534a11b09a;hb=17640273705d1450b806bb5c8e71c2849d864a37;hp=007eb1c80bfe9abdf3d2cbc2f450f88e8a35b8f6;hpb=45e4a52cdd094134c4595b0ff017b7a9d6a8243c;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 007eb1c..39ec527 100644
--- a/src/event.js
+++ b/src/event.js
@@ -102,7 +102,7 @@ jQuery.event = {
 
 		if ( events ) {
 			// Unbind all events for the element
-			if ( !types )
+			if ( types == undefined )
 				for ( var type in events )
 					this.remove( elem, type );
 			else {
@@ -134,7 +134,7 @@ jQuery.event = {
 						// remove generic event handler if no more handlers exist
 						for ( ret in events[type] ) break;
 						if ( !ret ) {
-							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(this, elem) === false ) {
+							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) {
 								if (elem.removeEventListener)
 									elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
 								else if (elem.detachEvent)
@@ -196,7 +196,7 @@ jQuery.event = {
 				data.shift();
 
 			// Handle triggering of extra function
-			if ( extra ) {
+			if ( extra && jQuery.isFunction( extra ) ) {
 				// call the extra function and tack the current return value on the end for possible inspection
 				var ret = extra.apply( elem, data.concat( val ) );
 				// if anything is returned, give it precedence and have it overwrite the previous value
@@ -263,11 +263,18 @@ jQuery.event = {
 	},
 
 	fix: function(event) {
+		// Short-circuit if the event has already been fixed by jQuery.event.fix
+		if ( event[ expando ] )
+			return event;
+			
 		// store a copy of the original event object 
 		// and clone to set read-only properties
 		var originalEvent = event;
 		event = jQuery.extend({}, originalEvent);
 		
+		// Mark the event as fixed by jQuery.event.fix
+		event[ expando ] = true;
+		
 		// add preventDefault and stopPropagation since 
 		// they will not work on the clone
 		event.preventDefault = function() {
@@ -323,45 +330,12 @@ jQuery.event = {
 	special: {
 		ready: {
 			setup: function() {
-				var handler = jQuery.event.special.ready.handler;
-				
-				// Mozilla, Opera and webkit nightlies currently support this event
-				if ( document.addEventListener )
-					// Use the handy event callback
-					document.addEventListener( "DOMContentLoaded", handler, false );
-	
-				// If Safari or IE is used
-				// Continually check to see if the document is ready
-				if ((jQuery.browser.msie && window == top) || jQuery.browser.safari ) (function(){
-					try {
-						// 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.documentElement.doScroll("left");
-					} catch( error ) {
-						setTimeout( arguments.callee, 0 );
-						return;
-					}
-
-					// and execute any waiting functions
-					handler();
-				})();
-
-				// A fallback to window.onload, that will always work
-				jQuery.event.add( window, "load", handler );
+				// Make sure the ready event is setup
+				bindReady();
+				return;
 			},
 			
-			teardown: function() {return;},
-			
-			handler: function() {
-				// Make sure that the DOM is not already loaded
-				if ( !jQuery.isReady ) {
-					// Remember that the DOM is ready
-					jQuery.isReady = true;
-					jQuery(document).triggerHandler("ready");
-					jQuery(document).unbind("ready");
-				}
-			}
+			teardown: function() { return; }
 		},
 		
 		mouseenter: {
@@ -462,14 +436,116 @@ jQuery.fn.extend({
 
 	hover: function(fnOver, fnOut) {
 		return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
+	},
+	
+	ready: function(fn) {
+		// Attach the listeners
+		bindReady();
+
+		// If the DOM is already ready
+		if ( jQuery.isReady )
+			// Execute the function immediately
+			fn.call( document, jQuery );
+			
+		// Otherwise, remember the function for later
+		else
+			// Add the function to the wait list
+			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
+	
+		return this;
 	}
 });
 
 jQuery.extend({
-	isReady: false
+	isReady: false,
+	readyList: [],
+	// Handle when the DOM is ready
+	ready: function() {
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.isReady ) {
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+			
+			// If there are functions bound, to execute
+			if ( jQuery.readyList ) {
+				// Execute all of them
+				jQuery.each( jQuery.readyList, function(){
+					this.apply( document );
+				});
+				
+				// Reset the list of functions
+				jQuery.readyList = null;
+			}
+		
+			// Trigger any bound ready events
+			$(document).triggerHandler("ready");
+		}
+	}
 });
 
-jQuery.each( ("blur,focus,load,ready,resize,scroll,unload,click,dblclick," +
+var readyBound = false;
+
+function bindReady(){
+	if ( readyBound ) return;
+	readyBound = true;
+
+	// Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
+	if ( document.addEventListener && !jQuery.browser.opera)
+		// Use the handy event callback
+		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
+	
+	// If IE is used and is not in a frame
+	// Continually check to see if the document is ready
+	if ( jQuery.browser.msie && window == top ) (function(){
+		if (jQuery.isReady) return;
+		try {
+			// If IE is used, use the trick by Diego Perini
+			// http://javascript.nwbox.com/IEContentLoaded/
+			document.documentElement.doScroll("left");
+		} catch( error ) {
+			setTimeout( arguments.callee, 0 );
+			return;
+		}
+		// and execute any waiting functions
+		jQuery.ready();
+	})();
+
+	if ( jQuery.browser.opera )
+		document.addEventListener( "DOMContentLoaded", function () {
+			if (jQuery.isReady) return;
+			for (var i = 0; i < document.styleSheets.length; i++)
+				if (document.styleSheets[i].disabled) {
+					setTimeout( arguments.callee, 0 );
+					return;
+				}
+			// and execute any waiting functions
+			jQuery.ready();
+		}, false);
+
+	if ( jQuery.browser.safari ) {
+		var numStyles;
+		(function(){
+			if (jQuery.isReady) return;
+			if ( document.readyState != "loaded" && document.readyState != "complete" ) {
+				setTimeout( arguments.callee, 0 );
+				return;
+			}
+			if ( numStyles === undefined )
+				numStyles = jQuery("style, link[rel=stylesheet]").length;
+			if ( document.styleSheets.length != numStyles ) {
+				setTimeout( arguments.callee, 0 );
+				return;
+			}
+			// and execute any waiting functions
+			jQuery.ready();
+		})();
+	}
+
+	// A fallback to window.onload, that will always work
+	jQuery.event.add( window, "load", jQuery.ready );
+}
+
+jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
 	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
 	"submit,keydown,keypress,keyup,error").split(","), function(i, name){