X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=2d9bdc27a8482fa2ce5094ebf394002af686892f;hb=b84b997ea4be31dd1fdcc63136811dcd324dec68;hp=e08a085c8043d9ddb22d3ef42c22d5ec9ec3de74;hpb=32b1cb3a5cde49b444fe4de269631942e9254b57;p=jquery.git

diff --git a/src/event.js b/src/event.js
index e08a085..2d9bdc2 100644
--- a/src/event.js
+++ b/src/event.js
@@ -160,7 +160,7 @@ jQuery.event = {
 
 	trigger: function(type, data, elem, donative, extra) {
 		// Clone the incoming data, if any
-		data = jQuery.makeArray(data || []);
+		data = jQuery.makeArray(data);
 
 		if ( type.indexOf("!") >= 0 ) {
 			type = type.slice(0, -1);
@@ -185,7 +185,7 @@ jQuery.event = {
 			
 			// Pass along a fake event
 			if ( event )
-				data.unshift( this.fix({ type: type, target: elem }) );
+				data.unshift( { type: type, target: elem } );
 
 			// Enforce the right trigger type
 			data[0].type = type;
@@ -231,7 +231,7 @@ jQuery.event = {
 
 	handle: function(event) {
 		// returned undefined or false
-		var val, namespace, all, handlers;
+		var val, ret, namespace, all, handlers;
 
 		event = arguments[0] = jQuery.event.fix( event || window.event );
 
@@ -253,29 +253,38 @@ jQuery.event = {
 				event.handler = handler;
 				event.data = handler.data;
 				
-				val = handler.apply( this, arguments );
+				ret = handler.apply( this, arguments );
+
+				if ( val !== false )
+					val = ret;
+
+				if ( ret === false ) {
+					event.preventDefault();
+					event.stopPropagation();
+				}
 			}
 		}
-		
-		if ( val === false ) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
 
 		// Clean up added properties in IE to prevent memory leak
 		if (jQuery.browser.msie)
 			event.target = event.preventDefault = event.stopPropagation =
-				event.handler = event.data = null;
+				event.handler = event.data = event[expando] = null;
 
 		return val;
 	},
 
 	fix: function(event) {
+		if ( event[expando] == true ) 
+			return event;
+		
 		// store a copy of the original event object 
 		// and clone to set read-only properties
 		var originalEvent = event;
 		event = jQuery.extend({}, originalEvent);
 		
+		// Mark it as fixed
+		event[expando] = true;
+		
 		// add preventDefault and stopPropagation since 
 		// they will not work on the clone
 		event.preventDefault = function() {