X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent.js;h=c7e2f4f43560d5467d25e81579497139b25a3c9a;hb=b2552e6ea35a1e00675d70a615d3af83137965df;hp=5f4b807cff60d50cea262af641eef1c6e2538d6e;hpb=c0446c70d52fe2afd74b2f95c384ae238c48ad09;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 5f4b807..c7e2f4f 100644
--- a/src/event.js
+++ b/src/event.js
@@ -163,99 +163,85 @@ jQuery.event = {
 		}
 	},
 
-	trigger: function( event, data, elem, extra) {
+	trigger: function( event, data, elem, bubbling /* internal */ ) {
 		// Event object or event type
 		var type = event.type || event;
 
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[expando] ? event :
-			// Object literal
-			jQuery.extend( jQuery.Event(type), event ) :
-			// Just the event type (string)
-			jQuery.Event(type);
-
-		if ( type.indexOf("!") >= 0 ) {
-			event.type = type = type.slice(0, -1);
-			event.exclusive = true;
-		}
-			
-		// Handle a global trigger
-		if ( !elem ) {
-			// Don't bubble custom events when global (to avoid too much overhead)
-			event.stopPropagation();
-			// Only trigger if we've ever bound an event for it
-			if ( this.global[type] )
-				jQuery.each( jQuery.cache, function(){
-					if ( this.events && this.events[type] )
-						jQuery.event.trigger( event, data, this.handle.elem );
-				});
+		if( !bubbling ){
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[expando] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
 
-		// Handle triggering a single element
-		} else {
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+				// Only trigger if we've ever bound an event for it
+				if ( this.global[type] )
+					jQuery.each( jQuery.cache, function(){
+						if ( this.events && this.events[type] )
+							jQuery.event.trigger( event, data, this.handle.elem );
+					});
+			}
+
+			// Handle triggering a single element
 
 			// don't do events on text and comment nodes
-			if ( elem.nodeType == 3 || elem.nodeType == 8 )
+			if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 )
 				return undefined;
-
-			// Clone the incoming data, if any
-			data = jQuery.makeArray(data);
-
+			
 			// AT_TARGET phase (not bubbling)
-			if( !event.target ){
+			if( !bubbling ){
 				// Clean up in case it is reused
 				event.result = undefined;
 				event.target = elem;
+				
+				// Clone the incoming data, if any
+				data = jQuery.makeArray(data);
+				data.unshift( event );
 			}
+		}
 
-			// Fix for custom events
-			event.currentTarget = elem;
-
-			data.unshift( event );
-
-			var fn = jQuery.isFunction( elem[ type ] );
-
-			// Trigger the event, it is assumed that "handle" is a function
-			var handle = jQuery.data(elem, "handle");
-			if ( handle )
-				handle.apply( elem, data );
-
-			// 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 )
-				event.result = false;
+		event.currentTarget = elem;
 
-			// Extra functions don't get the custom event object
-			data.shift();
+		var fn = jQuery.isFunction( elem[ type ] );
 
-			// 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 event, it is assumed that "handle" is a function
+		var handle = jQuery.data(elem, "handle");
+		if ( handle )
+			handle.apply( elem, data );
 
-			// 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;
-				try {
-					elem[ type ]();
-				// prevent IE from throwing an error for some hidden elements
-				} catch (e) {}
-			}
+		// 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 )
+			event.result = false;
 
-			if ( !event.isPropagationStopped() ) {
-				var parent = elem.parentNode || elem.ownerDocument;
-				if ( parent )
-					jQuery.event.trigger(event, data, parent);
-			}
+		// data.shift();
 
-			// Clean up, in case the event object is reused
-			event.target = null;
+		// Trigger the native events (except for clicks on links)
+		if ( !bubbling && fn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
+			this.triggered = true;
+			try {
+				elem[ type ]();
+			// prevent IE from throwing an error for some hidden elements
+			} catch (e) {}
+		}
 
-			this.triggered = false;
+		if ( !event.isPropagationStopped() ) {
+			var parent = elem.parentNode || elem.ownerDocument;
+			if ( parent )
+				jQuery.event.trigger(event, data, parent, true);
 		}
+
+		this.triggered = false;
 	},
 
 	handle: function(event) {
@@ -399,13 +385,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 +494,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 +546,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 +594,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