X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=9f384fbc800d89424cb9f3a969182f1c88e8c7e9;hb=2c07690377522119891784ec11c89e87f0a12545;hp=30f1b03b1a8bfce4d954ca4a6ac754c07b11750d;hpb=c73eadf59952f71f5c55fe9887f1f9e005fe95a4;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 30f1b03..9f384fb 100644
--- a/src/event.js
+++ b/src/event.js
@@ -109,9 +109,9 @@ jQuery.event = {
 
 		if ( events ) {
 			// Unbind all events for the element
-			if ( types == undefined )
+			if ( types == undefined || types[0] == "." )
 				for ( var type in events )
-					this.remove( elem, type );
+					this.remove( elem, type + (types || "") );
 			else {
 				// types is actually an event object here
 				if ( types.type ) {
@@ -169,6 +169,11 @@ jQuery.event = {
 		// Clone the incoming data, if any
 		data = jQuery.makeArray(data || []);
 
+		if ( type.indexOf("!") >= 0 ) {
+			type = type.slice(0, -1);
+			var exclusive = true;
+		}
+
 		// Handle a global trigger
 		if ( !elem ) {
 			// Only trigger if we've ever bound an event for it
@@ -191,6 +196,8 @@ jQuery.event = {
 
 			// Enforce the right trigger type
 			data[0].type = type;
+			if ( exclusive )
+				data[0].exclusive = true;
 
 			// Trigger the event
 			if ( jQuery.isFunction( jQuery.data(elem, "handle") ) )
@@ -207,7 +214,7 @@ jQuery.event = {
 			// Handle triggering of extra function
 			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 ) );
+				ret = extra.apply( elem, val == null ? data : data.concat( val ) );
 				// if anything is returned, give it precedence and have it overwrite the previous value
 				if (ret !== undefined)
 					val = ret;
@@ -250,7 +257,7 @@ jQuery.event = {
 			args[0].data = handler.data;
 
 			// Filter the functions by class
-			if ( !parts[1] || handler.type == parts[1] ) {
+			if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) {
 				var ret = handler.apply( this, args );
 
 				if ( val !== false )
@@ -314,7 +321,7 @@ jQuery.event = {
 		}
 			
 		// Add which for key events
-		if ( !event.which && (event.charCode || event.keyCode) )
+		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )
 			event.which = event.charCode || event.keyCode;
 		
 		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
@@ -563,7 +570,7 @@ var withinElement = function(event, elem) {
 	// Check if mouse(over|out) are still within the same parent element
 	var parent = event.relatedTarget;
 	// Traverse up the tree
-	while ( parent && parent != elem ) try { parent = parent.parentNode } catch(error) { parent = elem; };
+	while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }
 	// Return true if we actually just moused on to a sub-element
 	return parent == elem;
 };