X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=event%2Fevent.js;h=4171562ecaaf6aab90eca73e1465e246d789441a;hb=6ae392a4e57834224b2a686d774ab210da25daa5;hp=dcc0e884a30c2ac0b861220c6252fd3f6180a158;hpb=08bb08fede9392f8c7047e88d6989e0b8583b31e;p=jquery.git

diff --git a/event/event.js b/event/event.js
index dcc0e88..4171562 100644
--- a/event/event.js
+++ b/event/event.js
@@ -1,128 +1,179 @@
-(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"];
+// We're overriding the old toggle function, so
+// remember it for later
+jQuery.prototype._toggle = jQuery.prototype.toggle;
 
-	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]);
-			}); };
+/**
+ * Toggle between two function calls every other click.
+ */
+jQuery.prototype.toggle = function(a,b) {
+	// If two functions are passed in, we're
+	// toggling on a click
+	return a && b ? this.click(function(e){
+		// Figure out which function to execute
+		this.last = this.last == a ? b : a;
 		
-			// 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;
-		$.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]);
-		});
-		$.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]);
-		});
-	});
+		// Make sure that clicks don't pass through
+		e.preventDefault();
+		
+		// and execute the function
+		return jQuery.apply( this, this.last, [e] ) || false;
+	}) :
+	
+	// Otherwise, execute the old toggle function
+	this._toggle();
 };
 
-// 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] );
-		}
-		$.$$ready = null;
+/**
+ * Toggle between two function calls on mouse over/out.
+ */
+jQuery.prototype.hover = function(f,g) {
+	
+	// A private function for haandling mouse 'hovering'
+	function handleHover(e) {
+		// Check if mouse(over|out) are still within the same parent element
+		var p = e.fromElement || e.toElement || e.relatedTarget;
+		while ( p && p != this ) p = p.parentNode;
+		
+		// If we actually just moused on to a sub-element, ignore it
+		if ( p == this ) return false;
+		
+		// Execute the right function
+		return (e.type == "mouseover" ? f : g).apply(this,[e]);
 	}
+	
+	// Bind the function to the two event listeners
+	return this.mouseover(handleHover).mouseout(handleHover);
 };
 
-// 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;
-}
-
-// 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 ( $.$$ready ) {
-			$.$$ready.push( f );
-		} else {
-			var o = this;
-			$.$$ready = [ f ];
+jQuery.prototype.ready = function(f) {
+	// If the DOM is already ready
+	if ( jQuery.isReady )
+		// Execute the function immediately
+		jQuery.apply( document, f );
+		
+	// Otherwise, remember the function for later
+	else {
+		// Add the function to the wait list
+		jQuery.readyList.push( f );
+	}
 
-			// 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 );
-			}
-		}
-	});
+	return this;
 };
 
-$.fn.toggle = function(a,b) {
-	return a && b ? this.click(function(e){
-		this.$$last = this.$$last == a ? b : a;
-		e.preventDefault();
-		return $.apply( this, this.$$last, [e] ) || false;
-	}) : this._toggle();
-};
+(function(){
+	/*
+	 * Bind a number of event-handling functions, dynamically
+	 */
+	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".split(",");
+
+	// Go through all the event names, but make sure that
+	// it is enclosed properly
+	for ( var i = 0; i < e.length; i++ ) {(function(){
+			
+		var o = e[i];
+		
+		// Handle event binding
+		jQuery.prototype[o] = function(f){ return this.bind(o, f); };
+		
+		// Handle event unbinding
+		jQuery.prototype["un"+o] = function(f){ return this.unbind(o, f); };
+		
+		// Handle event triggering
+		jQuery.prototype["do"+o] = function(){ return this.trigger(o); };
+		
+		// Finally, handle events that only fire once
+		jQuery.prototype["one"+o] = function(f){
+			// Attach the event listener
+			return this.bind(o, function(e){
+				// TODO: Remove the event listener, instead of this hack
+				
+				// If this function has already been executed, stop
+				if ( this[o+f] !== null )
+					return true;
+				
+				// Otherwise, mark as having been executed
+				this[o+f]++;
+				
+				// And execute the bound function
+				return jQuery.apply(this,f,[e]);
+			});
+		};
+			
+	})();}
+		
+	/*
+	 * All the code that makes DOM Ready work nicely.
+	 */
+	 
+	jQuery.isReady = false;
+	jQuery.readyList = [];
+	
+	// Handle when the DOM is ready
+	jQuery.ready = function() {
+		// Make sure that the DOM hasn't 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
+				for ( var i = 0; i < jQuery.readyList.length; i++ )
+					jQuery.apply( document, jQuery.readyList[i] );
+				
+				// Reset the list of functions
+				jQuery.readyList = null;
+			}
+		}
+	};
+	
+	// If Mozilla is used
+	if ( jQuery.browser == "mozilla" || jQuery.browser == "opera" ) {
+		// Use the handy event callback
+		jQuery.event.add( document, "DOMContentLoaded", jQuery.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 ( jQuery.browser == "msie" ) {
+	
+		// Only works if you document.write() it
+		document.write("<scr" + "ipt 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" )
+				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;
+	
+				// and execute any waiting functions
+				jQuery.ready();
+			}
+		}, 10);
+	}
+	
+	// A fallback to window.onload, that will always work
+	jQuery.event.add( window, "load", jQuery.ready );
+	
+})();