X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent.js;h=4c710c10ca647ed845db556a9516bfb919cb1d3b;hb=08836acc30d0b715860171412bd8d61e1db4c96b;hp=4be458798929851e161b9208937b172be88a7ded;hpb=6d28ebff85e6bb9f27006fe557d249d4c6b9f584;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 4be4587..4c710c1 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);
@@ -184,8 +184,16 @@ jQuery.event = {
 				event = !data[0] || !data[0].preventDefault;
 			
 			// Pass along a fake event
-			if ( event )
-				data.unshift( this.fix({ type: type, target: elem }) );
+			if ( event ) {
+				data.unshift({ 
+					type: type, 
+					target: elem, 
+					preventDefault: function(){}, 
+					stopPropagation: function(){}, 
+					timeStamp: +new Date
+				});
+				data[0][expando] = true; // no need to fix fake event
+			}
 
 			// Enforce the right trigger type
 			data[0].type = type;
@@ -231,7 +239,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,28 +261,35 @@ 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;
 
 		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
+		// and "clone" to set read-only properties
 		var originalEvent = event;
-		event = jQuery.extend({}, originalEvent);
+		event = { originalEvent: originalEvent };
+		var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
+		for ( var i=props.length; i; i-- )
+			event[ props[i] ] = originalEvent[ props[i] ];
+		
+		// Mark it as fixed
+		event[expando] = true;
 		
 		// add preventDefault and stopPropagation since 
 		// they will not work on the clone
@@ -293,13 +308,16 @@ jQuery.event = {
 			originalEvent.cancelBubble = true;
 		};
 		
+		// Fix timeStamp
+		event.timeStamp = event.timeStamp || +new Date;
+		
 		// Fix target property, if necessary
 		if ( !event.target )
 			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
 				
 		// check if target is a textnode (safari)
 		if ( event.target.nodeType == 3 )
-			event.target = originalEvent.target.parentNode;
+			event.target = event.target.parentNode;
 
 		// Add relatedTarget, if necessary
 		if ( !event.relatedTarget && event.fromElement )
@@ -425,13 +443,13 @@ jQuery.fn.extend({
 
 		return this.click(function(event) {
 			// Figure out which function to execute
-			this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+			this.lastToggle = ( this.lastToggle || 0 ) % args.length;
 			
 			// Make sure that clicks stop
 			event.preventDefault();
 			
 			// and execute the function
-			return args[this.lastToggle].apply( this, arguments ) || false;
+			return args[ this.lastToggle++ ].apply( this, arguments ) || false;
 		});
 	},