X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent.js;h=d0cacf6b582b174cab4540573e5566b14232aade;hb=5d033dba02fc1ffe1398cdaf0e9d402fc75e13f0;hp=d5be7c5a921712caab3882a1d8e5fc13ea144ddb;hpb=fde3d616ac3d8efe822c6dbf23d7659b00fc54b1;p=jquery.git

diff --git a/src/event.js b/src/event.js
index d5be7c5..d0cacf6 100644
--- a/src/event.js
+++ b/src/event.js
@@ -49,10 +49,14 @@ jQuery.event = {
 				if ( typeof jQuery == "undefined" || jQuery.event.triggered )
 					return val;
 		
-				val = jQuery.event.handle.apply(elem, arguments);
+				val = jQuery.event.handle.apply(arguments.callee.elem, arguments);
 		
 				return val;
 			});
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native
+		// event in IE.
+		handle.elem = elem;
 			
 			// Handle multiple events seperated by a space
 			// jQuery(...).bind("mouseover mouseout", fn);
@@ -87,6 +91,9 @@ jQuery.event = {
 				// Keep track of which events have been used, for global triggering
 				jQuery.event.global[type] = true;
 			});
+		
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
 	},
 
 	guid: 1,
@@ -102,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 ) {
@@ -150,6 +157,8 @@ jQuery.event = {
 			// Remove the expando if it's no longer used
 			for ( ret in events ) break;
 			if ( !ret ) {
+				var handle = jQuery.data( elem, "handle" );
+				if ( handle ) handle.elem = null;
 				jQuery.removeData( elem, "events" );
 				jQuery.removeData( elem, "handle" );
 			}
@@ -160,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
@@ -182,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
@@ -198,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;
@@ -241,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 )
@@ -305,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)
@@ -554,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;
 };