X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=9b3788b4e695f23874462f49a9bd4e82e94697a1;hb=458d427c0e4af4502e14400110b5327aa2513781;hp=1a8a6b51968948ac6e59ce1bb65c0b12beb7eff4;hpb=4805a45c0669b298c24005ce6505b49d88f85fe7;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 1a8a6b5..9b3788b 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -140,7 +140,7 @@ jQuery.event = {
 		}
 				
 		// check if target is a textnode (safari)
-		if (event.target.nodeType == 3) {
+		if (jQuery.browser.safari && event.target.nodeType == 3) {
 			// store a copy of the original event object 
 			// and clone because target is read only
 			var originalEvent = event;
@@ -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 ) {
@@ -502,19 +490,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the submit event of each matched element.
 	 *
 	 * @example $("#myform").submit( function() {
@@ -587,19 +562,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the dblclick event of each matched element.
 	 *
 	 * @example $("p").dblclick( function() { alert("Hello"); } );
@@ -613,19 +575,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the keypress event of each matched element.
 	 *
 	 * @example $("p").keypress( function() { alert("Hello"); } );
@@ -639,19 +588,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the error event of each matched element.
 	 *
 	 * @example $("p").error( function() { alert("Hello"); } );
@@ -665,19 +601,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the blur event of each matched element.
 	 *
 	 * @example $("p").blur( function() { alert("Hello"); } );
@@ -720,23 +643,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the select event of each matched element.
 	 *
 	 * @example $("p").select( function() { alert("Hello"); } );
@@ -776,19 +682,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the unload event of each matched element.
 	 *
 	 * @example $("p").unload( function() { alert("Hello"); } );
@@ -802,19 +695,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the change event of each matched element.
 	 *
 	 * @example $("p").change( function() { alert("Hello"); } );
@@ -828,19 +708,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the mouseout event of each matched element.
 	 *
 	 * @example $("p").mouseout( function() { alert("Hello"); } );
@@ -854,19 +721,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the keyup event of each matched element.
 	 *
 	 * @example $("p").keyup( function() { alert("Hello"); } );
@@ -880,19 +734,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the click event of each matched element.
 	 *
 	 * @example $("p").click( function() { alert("Hello"); } );
@@ -932,19 +773,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the mousemove event of each matched element.
 	 *
 	 * @example $("p").mousemove( function() { alert("Hello"); } );
@@ -958,19 +786,6 @@ new function(){
 	 */
 
 	/**
-	 * 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
-	 */
-
-	/**
 	 * Bind a function to the mousedown event of each matched element.
 	 *
 	 * @example $("p").mousedown( function() { alert("Hello"); } );
@@ -982,19 +797,6 @@ new function(){
 	 * @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
-	 */
 	 
 	/**
 	 * Bind a function to the mouseover event of each matched element.
@@ -1008,36 +810,16 @@ new function(){
 	 * @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
-	 */
-
-	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;