X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=414f9420ea1304d66b8d9cb549799dcec92b889f;hb=989e3f61f78c773d5c6066152c0bf3fd61d752ed;hp=5f4b807cff60d50cea262af641eef1c6e2538d6e;hpb=c0446c70d52fe2afd74b2f95c384ae238c48ad09;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 5f4b807..414f942 100644
--- a/src/event.js
+++ b/src/event.js
@@ -163,7 +163,7 @@ jQuery.event = {
 		}
 	},
 
-	trigger: function( event, data, elem, extra) {
+	trigger: function( event, data, elem) {
 		// Event object or event type
 		var type = event.type || event;
 
@@ -227,15 +227,6 @@ jQuery.event = {
 			// Extra functions don't get the custom event object
 			data.shift();
 
-			// 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, event.result == null ? data : data.concat( event.result ) );
-				// if anything is returned, give it precedence and have it overwrite the previous value
-				if ( ret !== undefined )
-					event.result = ret;
-			}
-
 			// Trigger the native events (except for clicks on links)
 			if ( event.target === elem && fn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
 				this.triggered = true;
@@ -399,13 +390,14 @@ jQuery.Event = function( src ){
 	if( src && src.type ){
 		this.originalEvent = src;
 		this.type = src.type;
-		
-		// Fix timeStamp
-		this.timeStamp = src.timeStamp || now();
+		this.timeStamp = src.timeStamp;
 	// Event type
 	}else
 		this.type = src;
 
+	if( !this.timeStamp )
+		this.timeStamp = now();
+	
 	// Mark it as fixed
 	this[expando] = true;
 };
@@ -507,18 +499,18 @@ jQuery.fn.extend({
 		});
 	},
 
-	trigger: function( type, data, fn ) {
+	trigger: function( type, data ) {
 		return this.each(function(){
-			jQuery.event.trigger( type, data, this, fn );
+			jQuery.event.trigger( type, data, this );
 		});
 	},
 
-	triggerHandler: function( type, data, fn ) {
+	triggerHandler: function( type, data ) {
 		if( this[0] ){
 			var event = jQuery.Event(type);
 			event.preventDefault();
 			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0], fn );
+			jQuery.event.trigger( event, data, this[0] );
 			return event.result;
 		}		
 	},
@@ -559,7 +551,7 @@ jQuery.fn.extend({
 		// Otherwise, remember the function for later
 		else
 			// Add the function to the wait list
-			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
+			jQuery.readyList.push( fn );
 
 		return this;
 	},
@@ -607,7 +599,7 @@ jQuery.extend({
 			if ( jQuery.readyList ) {
 				// Execute all of them
 				jQuery.each( jQuery.readyList, function(){
-					this.call( document );
+					this.call( document, jQuery );
 				});
 
 				// Reset the list of functions