X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=852b3135233eb017011376ef2060d0376eeeae84;hb=8937e088b6f06a0dbef36348aef5d7c10f3af340;hp=55e205ae2a6edc1d244eb576eae8a60f1f9f8f6c;hpb=897fbfe89c90de5f20a3eed2aeb187c625cfb43d;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 55e205a..852b313 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -10,37 +10,32 @@ jQuery.fn.extend({
 	 * is fired, when clicked again, the second is fired. All subsequent 
 	 * clicks continue to rotate through the two functions.
 	 *
+	 * Use unbind("click") to remove.
+	 *
 	 * @example $("p").toggle(function(){
 	 *   $(this).addClass("selected");
 	 * },function(){
 	 *   $(this).removeClass("selected");
 	 * });
 	 * 
-	 * @test var count = 0;
-	 * var fn1 = function() { count++; }
-	 * var fn2 = function() { count--; }
-	 * var link = $('#mark');
-	 * link.click().toggle(fn1, fn2).click().click().click().click().click();
-	 * ok( count == 1, "Check for toggle(fn, fn)" );
-	 *
 	 * @name toggle
 	 * @type jQuery
 	 * @param Function even The function to execute on every even click.
 	 * @param Function odd The function to execute on every odd click.
 	 * @cat Events
 	 */
-	toggle: function(a,b) {
-		// If two functions are passed in, we're
-		// toggling on a click
-		return a && b && a.constructor == Function && b.constructor == Function ? this.click(function(e){
+	toggle: function() {
+		// save reference to arguments for access in closure
+		var a = arguments;
+		return typeof a[0] == "function" && typeof a[1] == "function" ? this.click(function(e) {
 			// Figure out which function to execute
-			this.last = this.last == a ? b : a;
+			this.lastToggle = this.lastToggle == 0 ? 1 : 0;
 			
 			// Make sure that clicks stop
 			e.preventDefault();
 			
 			// and execute the function
-			return this.last.apply( this, [e] ) || false;
+			return a[this.lastToggle].apply( this, [e] ) || false;
 		}) :
 		
 		// Otherwise, execute the old toggle function
@@ -108,6 +103,7 @@ jQuery.fn.extend({
 	 * otherwise $(document).ready() may not fire.
 	 *
 	 * You can have as many $(document).ready events on your page as you like.
+	 * The functions are then executed in the order they were added.
 	 *
 	 * @example $(document).ready(function(){ Your code here... });
 	 *
@@ -235,9 +231,11 @@ new function(){
 		/**
 		 * Bind a function to the submit event of each matched element.
 		 *
-		 * @example $("p").submit( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onsubmit="alert('Hello');">Hello</p>
+		 * @example $("#myform").submit( function() {
+		 *   return $("input", this).val().length > 0;
+		 * } );
+		 * @before <form id="myform"><input /></form>
+		 * @desc Prevents the form submission when the input has no value entered.
 		 *
 		 * @name submit
 		 * @type jQuery
@@ -249,9 +247,11 @@ new function(){
 		 * Trigger the submit event of each matched element. This causes all of the functions
 		 * that have been bound to thet submit event to be executed.
 		 *
-		 * @example $("p").submit();
-		 * @before <p onsubmit="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
+		 * Note: This does not execute the submit method of the form element! If you need to
+		 * submit the form via code, you have to use the DOM method, eg. $("form")[0].submit();
+		 *
+		 * @example $("form").submit();
+		 * @desc Triggers all submit events registered for forms, but does not submit the form
 		 *
 		 * @name submit
 		 * @type jQuery
@@ -317,6 +317,9 @@ new function(){
 		 * Trigger the focus event of each matched element. This causes all of the functions
 		 * that have been bound to thet focus event to be executed.
 		 *
+		 * Note: This does not execute the focus method of the underlying elements! If you need to
+		 * focus an element via code, you have to use the DOM method, eg. $("#myinput")[0].focus();
+		 *
 		 * @example $("p").focus();
 		 * @before <p onfocus="alert('Hello');">Hello</p>
 		 * @result alert('Hello');
@@ -657,6 +660,9 @@ new function(){
 		 * Trigger the blur event of each matched element. This causes all of the functions
 		 * that have been bound to thet blur event to be executed.
 		 *
+		 * Note: This does not execute the blur method of the underlying elements! If you need to
+		 * blur an element via code, you have to use the DOM method, eg. $("#myinput")[0].blur();
+		 *
 		 * @example $("p").blur();
 		 * @before <p onblur="alert('Hello');">Hello</p>
 		 * @result alert('Hello');
@@ -1527,53 +1533,9 @@ new function(){
 		 * @type jQuery
 		 * @cat Events/Mouse
 		 */
-		 
-		 /**
-		  * @test var count;
-		  * // ignore load
-		  * var e = ("blur,focus,resize,scroll,unload,click,dblclick," +
-		  * 		"mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," + 
-		  * 		"submit,keydown,keypress,keyup,error").split(",");
-		  * var handler1 = function(event) {
-		  * 	count++;
-		  * };
-		  * var handler2 = function(event) {
-		  * 	count++;
-		  * };
-		  * for( var i=0; i < e.length; i++) {
-		  * 	var event = e[i];
-		  * 	count = 0;
-		  * 	// bind handler
-		  * 	$(document)[event](handler1);
-		  *		$(document)[event](handler2);
-		  * 	$(document)["one"+event](handler1);
-		  * 	
-		  * 	// call event two times
-		  * 	$(document)[event]();
-		  * 	$(document)[event]();
-		  * 	
-		  * 	// unbind events
-		  * 	$(document)["un"+event](handler1);
-		  * 	// call once more
-		  * 	$(document)[event]();
-		  *
-		  * 	// remove all handlers
-		  *		$(document)["un"+event]();
-		  *
-		  * 	// call once more
-		  * 	$(document)[event]();
-		  * 	
-		  * 	// assert count
-		  *     ok( count == 6, 'Checking event ' + event);
-		  * }
-		  *
-		  * @private
-		  * @name eventTesting
-		  * @cat Events
-		  */
 
 	var e = ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-		"mousedown,mouseup,mousemove,mouseover,mouseout,change,reset,select," + 
+		"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
 		"submit,keydown,keypress,keyup,error").split(",");
 
 	// Go through all the event names, but make sure that
@@ -1583,8 +1545,8 @@ new function(){
 		var o = e[i];
 		
 		// Handle event binding
-		jQuery.fn[o] = function(f, amount){
-			return f ? this.bind(o, f, amount) : this.trigger(o);
+		jQuery.fn[o] = function(f){
+			return f ? this.bind(o, f) : this.trigger(o);
 		};
 		
 		// Handle event unbinding
@@ -1592,8 +1554,16 @@ new function(){
 		
 		// Finally, handle events that only fire once
 		jQuery.fn["one"+o] = function(f){
-			// use bind with amount param to bind only once
-			return this.bind(o, f, 1);
+			// save cloned reference to this
+			var element = jQuery(this);
+			var handler = function() {
+				// unbind itself when executed
+				element.unbind(o, handler);
+				element = null;
+				// apply original handler with the same arguments
+				return f.apply(this, arguments);
+			};
+			return this.bind(o, handler);
 		};
 			
 	};
@@ -1613,11 +1583,12 @@ new function(){
 	
 		// Use the defer script hack
 		var script = document.getElementById("__ie_init");
-		script.onreadystatechange = function() {
-			if ( this.readyState != "complete" ) return;
-			this.parentNode.removeChild( this );
-			jQuery.ready();
-		};
+		if (script) // script does not exist if jQuery is loaded dynamically
+			script.onreadystatechange = function() {
+				if ( this.readyState != "complete" ) return;
+				this.parentNode.removeChild( this );
+				jQuery.ready();
+			};
 	
 		// Clear from memory
 		script = null;