X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent.js;h=d0cacf6b582b174cab4540573e5566b14232aade;hb=3e285bd60de63afe314971957a0547603bb74386;hp=89391d5dd179d556e3af833ddfcb035f0367c1ef;hpb=87d6bcec31046d84d1b4518d0888f1715e15e60b;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 89391d5..d0cacf6 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 || (typeof types == "string" && types.charAt(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,13 +196,15 @@ 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") ) )
 				val = jQuery.data(elem, "handle").apply( elem, data );
 
-			// Handle triggering native .onfoo handlers
-			if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+			// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+			if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
 				val = false;
 
 			// Extra functions don't get the custom event object
@@ -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
-				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 )