X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=6e8a45f81a24069055a86c8267215893b6f353ac;hb=d7b73ea5c7440c49c804b3cafe67e84aafbdd064;hp=ac6948046f9c17ac56774badb143e386afc1655c;hpb=af9e5d45fca6b198d27c4e33e7c96d7d802e688a;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index ac69480..6e8a45f 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -265,43 +265,31 @@ jQuery.fn.extend({
 
 	/**
 	 * The opposite of bind, removes a bound event from each of the matched
-	 * elements. You must pass the identical function that was used in the original
-	 * bind method.
+	 * elements.
 	 *
-	 * @example $("p").unbind( "click", function() { alert("Hello"); } )
+	 * Without any arguments, all bound events are removed.
+	 *
+	 * If the type is provided, all bound events of that type are removed.
+	 *
+	 * If the function that was passed to bind is provided as the second argument,
+	 * only that specific event handler is removed.
+	 *
+	 * @example $("p").unbind()
 	 * @before <p onclick="alert('Hello');">Hello</p>
 	 * @result [ <p>Hello</p> ]
 	 *
-	 * @name unbind
-	 * @type jQuery
-	 * @param String type An event type
-	 * @param Function fn A function to unbind from the event on each of the set of matched elements
-	 * @cat Events
-	 */
-
-	/**
-	 * Removes all bound events of a particular type from each of the matched
-	 * elements.
-	 *
 	 * @example $("p").unbind( "click" )
 	 * @before <p onclick="alert('Hello');">Hello</p>
 	 * @result [ <p>Hello</p> ]
 	 *
-	 * @name unbind
-	 * @type jQuery
-	 * @param String type An event type
-	 * @cat Events
-	 */
-
-	/**
-	 * Removes all bound events from each of the matched elements.
-	 *
-	 * @example $("p").unbind()
+	 * @example $("p").unbind( "click", function() { alert("Hello"); } )
 	 * @before <p onclick="alert('Hello');">Hello</p>
 	 * @result [ <p>Hello</p> ]
 	 *
 	 * @name unbind
 	 * @type jQuery
+	 * @param String type (optional) An event type
+	 * @param Function fn (optional) A function to unbind from the event on each of the set of matched elements
 	 * @cat Events
 	 */
 	unbind: function( type, fn ) {
@@ -498,20 +486,7 @@ new function(){
 	 * @name scroll
 	 * @type jQuery
 	 * @param Function fn A function to bind to the scroll event on each of the matched elements.
-	 * @cat Events/Browser
-	 */
-
-	/**
-	 * Trigger the scroll event of each matched element. This causes all of the functions
-	 * that have been bound to thet scroll event to be executed.
-	 *
-	 * @example $("p").scroll();
-	 * @before <p onscroll="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name scroll
-	 * @type jQuery
-	 * @cat Events/Browser
+	 * @cat Events
 	 */
 
 	/**
@@ -526,7 +501,7 @@ new function(){
 	 * @name submit
 	 * @type jQuery
 	 * @param Function fn A function to bind to the submit event on each of the matched elements.
-	 * @cat Events/Form
+	 * @cat Events
 	 */
 
 	/**
@@ -541,7 +516,7 @@ new function(){
 	 *
 	 * @name submit
 	 * @type jQuery
-	 * @cat Events/Form
+	 * @cat Events
 	 */
 
 	/**
@@ -554,7 +529,7 @@ new function(){
 	 * @name focus
 	 * @type jQuery
 	 * @param Function fn A function to bind to the focus event on each of the matched elements.
-	 * @cat Events/UI
+	 * @cat Events
 	 */
 
 	/**
@@ -570,7 +545,7 @@ new function(){
 	 *
 	 * @name focus
 	 * @type jQuery
-	 * @cat Events/UI
+	 * @cat Events
 	 */
 
 	/**
@@ -583,20 +558,7 @@ new function(){
 	 * @name keydown
 	 * @type jQuery
 	 * @param Function fn A function to bind to the keydown event on each of the matched elements.
-	 * @cat Events/Keyboard
-	 */
-
-	/**
-	 * Trigger the keydown event of each matched element. This causes all of the functions
-	 * that have been bound to thet keydown event to be executed.
-	 *
-	 * @example $("p").keydown();
-	 * @before <p onkeydown="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name keydown
-	 * @type jQuery
-	 * @cat Events/Keyboard
+	 * @cat Events
 	 */
 
 	/**
@@ -609,20 +571,7 @@ new function(){
 	 * @name dblclick
 	 * @type jQuery
 	 * @param Function fn A function to bind to the dblclick event on each of the matched elements.
-	 * @cat Events/Mouse
-	 */
-
-	/**
-	 * Trigger the dblclick event of each matched element. This causes all of the functions
-	 * that have been bound to thet dblclick event to be executed.
-	 *
-	 * @example $("p").dblclick();
-	 * @before <p ondblclick="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name dblclick
-	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 
 	/**
@@ -635,20 +584,7 @@ new function(){
 	 * @name keypress
 	 * @type jQuery
 	 * @param Function fn A function to bind to the keypress event on each of the matched elements.
-	 * @cat Events/Keyboard
-	 */
-
-	/**
-	 * Trigger the keypress event of each matched element. This causes all of the functions
-	 * that have been bound to thet keypress event to be executed.
-	 *
-	 * @example $("p").keypress();
-	 * @before <p onkeypress="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name keypress
-	 * @type jQuery
-	 * @cat Events/Keyboard
+	 * @cat Events
 	 */
 
 	/**
@@ -661,20 +597,7 @@ new function(){
 	 * @name error
 	 * @type jQuery
 	 * @param Function fn A function to bind to the error event on each of the matched elements.
-	 * @cat Events/Browser
-	 */
-
-	/**
-	 * Trigger the error event of each matched element. This causes all of the functions
-	 * that have been bound to thet error event to be executed.
-	 *
-	 * @example $("p").error();
-	 * @before <p onerror="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name error
-	 * @type jQuery
-	 * @cat Events/Browser
+	 * @cat Events
 	 */
 
 	/**
@@ -687,7 +610,7 @@ new function(){
 	 * @name blur
 	 * @type jQuery
 	 * @param Function fn A function to bind to the blur event on each of the matched elements.
-	 * @cat Events/UI
+	 * @cat Events
 	 */
 
 	/**
@@ -703,7 +626,7 @@ new function(){
 	 *
 	 * @name blur
 	 * @type jQuery
-	 * @cat Events/UI
+	 * @cat Events
 	 */
 
 	/**
@@ -716,24 +639,7 @@ new function(){
 	 * @name load
 	 * @type jQuery
 	 * @param Function fn A function to bind to the load event on each of the matched elements.
-	 * @cat Events/Browser
-	 */
-
-	/**
-	 * Trigger the load event of each matched element. This causes all of the functions
-	 * that have been bound to thet load event to be executed.
-	 *
-	 * Marked as private: Calling load() without arguments throws exception because the ajax load
-	 * does not handle it.
-	 *
-	 * @example $("p").load();
-	 * @before <p onload="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name load
-	 * @private
-	 * @type jQuery
-	 * @cat Events/Browser
+	 * @cat Events
 	 */
 
 	/**
@@ -746,7 +652,7 @@ new function(){
 	 * @name select
 	 * @type jQuery
 	 * @param Function fn A function to bind to the select event on each of the matched elements.
-	 * @cat Events/Form
+	 * @cat Events
 	 */
 
 	/**
@@ -759,7 +665,7 @@ new function(){
 	 *
 	 * @name select
 	 * @type jQuery
-	 * @cat Events/Form
+	 * @cat Events
 	 */
 
 	/**
@@ -772,20 +678,7 @@ new function(){
 	 * @name mouseup
 	 * @type jQuery
 	 * @param Function fn A function to bind to the mouseup event on each of the matched elements.
-	 * @cat Events/Mouse
-	 */
-
-	/**
-	 * Trigger the mouseup event of each matched element. This causes all of the functions
-	 * that have been bound to thet mouseup event to be executed.
-	 *
-	 * @example $("p").mouseup();
-	 * @before <p onmouseup="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name mouseup
-	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 
 	/**
@@ -798,20 +691,7 @@ new function(){
 	 * @name unload
 	 * @type jQuery
 	 * @param Function fn A function to bind to the unload event on each of the matched elements.
-	 * @cat Events/Browser
-	 */
-
-	/**
-	 * Trigger the unload event of each matched element. This causes all of the functions
-	 * that have been bound to thet unload event to be executed.
-	 *
-	 * @example $("p").unload();
-	 * @before <p onunload="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name unload
-	 * @type jQuery
-	 * @cat Events/Browser
+	 * @cat Events
 	 */
 
 	/**
@@ -824,20 +704,7 @@ new function(){
 	 * @name change
 	 * @type jQuery
 	 * @param Function fn A function to bind to the change event on each of the matched elements.
-	 * @cat Events/Form
-	 */
-
-	/**
-	 * Trigger the change event of each matched element. This causes all of the functions
-	 * that have been bound to thet change event to be executed.
-	 *
-	 * @example $("p").change();
-	 * @before <p onchange="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name change
-	 * @type jQuery
-	 * @cat Events/Form
+	 * @cat Events
 	 */
 
 	/**
@@ -850,20 +717,7 @@ new function(){
 	 * @name mouseout
 	 * @type jQuery
 	 * @param Function fn A function to bind to the mouseout event on each of the matched elements.
-	 * @cat Events/Mouse
-	 */
-
-	/**
-	 * Trigger the mouseout event of each matched element. This causes all of the functions
-	 * that have been bound to thet mouseout event to be executed.
-	 *
-	 * @example $("p").mouseout();
-	 * @before <p onmouseout="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name mouseout
-	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 
 	/**
@@ -876,20 +730,7 @@ new function(){
 	 * @name keyup
 	 * @type jQuery
 	 * @param Function fn A function to bind to the keyup event on each of the matched elements.
-	 * @cat Events/Keyboard
-	 */
-
-	/**
-	 * Trigger the keyup event of each matched element. This causes all of the functions
-	 * that have been bound to thet keyup event to be executed.
-	 *
-	 * @example $("p").keyup();
-	 * @before <p onkeyup="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name keyup
-	 * @type jQuery
-	 * @cat Events/Keyboard
+	 * @cat Events
 	 */
 
 	/**
@@ -902,7 +743,7 @@ new function(){
 	 * @name click
 	 * @type jQuery
 	 * @param Function fn A function to bind to the click event on each of the matched elements.
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 
 	/**
@@ -915,7 +756,7 @@ new function(){
 	 *
 	 * @name click
 	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 
 	/**
@@ -928,20 +769,7 @@ new function(){
 	 * @name resize
 	 * @type jQuery
 	 * @param Function fn A function to bind to the resize event on each of the matched elements.
-	 * @cat Events/Browser
-	 */
-
-	/**
-	 * Trigger the resize event of each matched element. This causes all of the functions
-	 * that have been bound to thet resize event to be executed.
-	 *
-	 * @example $("p").resize();
-	 * @before <p onresize="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name resize
-	 * @type jQuery
-	 * @cat Events/Browser
+	 * @cat Events
 	 */
 
 	/**
@@ -954,20 +782,7 @@ new function(){
 	 * @name mousemove
 	 * @type jQuery
 	 * @param Function fn A function to bind to the mousemove event on each of the matched elements.
-	 * @cat Events/Mouse
-	 */
-
-	/**
-	 * Trigger the mousemove event of each matched element. This causes all of the functions
-	 * that have been bound to thet mousemove event to be executed.
-	 *
-	 * @example $("p").mousemove();
-	 * @before <p onmousemove="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name mousemove
-	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 
 	/**
@@ -980,20 +795,7 @@ new function(){
 	 * @name mousedown
 	 * @type jQuery
 	 * @param Function fn A function to bind to the mousedown event on each of the matched elements.
-	 * @cat Events/Mouse
-	 */
-
-	/**
-	 * Trigger the mousedown event of each matched element. This causes all of the functions
-	 * that have been bound to thet mousedown event to be executed.
-	 *
-	 * @example $("p").mousedown();
-	 * @before <p onmousedown="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name mousedown
-	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
 	 
 	/**
@@ -1006,38 +808,18 @@ new function(){
 	 * @name mouseover
 	 * @type jQuery
 	 * @param Function fn A function to bind to the mousedown event on each of the matched elements.
-	 * @cat Events/Mouse
-	 */
-
-	/**
-	 * Trigger the mouseover event of each matched element. This causes all of the functions
-	 * that have been bound to thet mousedown event to be executed.
-	 *
-	 * @example $("p").mouseover();
-	 * @before <p onmouseover="alert('Hello');">Hello</p>
-	 * @result alert('Hello');
-	 *
-	 * @name mouseover
-	 * @type jQuery
-	 * @cat Events/Mouse
+	 * @cat Events
 	 */
-
-	var e = ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+	jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
 		"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
-		"submit,keydown,keypress,keyup,error").split(",");
-
-	// Go through all the event names, but make sure that
-	// it is enclosed properly
-	for ( var i = 0; i < e.length; i++ ) new function(){
-			
-		var o = e[i];
+		"submit,keydown,keypress,keyup,error").split(","), function(i,o){
 		
 		// Handle event binding
 		jQuery.fn[o] = function(f){
 			return f ? this.bind(o, f) : this.trigger(o);
 		};
 			
-	};
+	});
 	
 	// If Mozilla is used
 	if ( jQuery.browser.mozilla || jQuery.browser.opera )
@@ -1090,7 +872,7 @@ new function(){
 
 // Clean up after IE to avoid memory leaks
 if (jQuery.browser.msie)
-	jQuery(window).bind("unload", function() {
+	jQuery(window).one("unload", function() {
 		var global = jQuery.event.global;
 		for ( var type in global ) {
 			var els = global[type], i = els.length;