X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=81c193980bc16d7a8bc98b5a041e0dd285d0cac8;hb=43f235f4257359dfcf9270cf31c56aa547d01fd3;hp=88bbbda2b31771f0daafacb28bbb33614c34b889;hpb=34355cd6986d5939dc711c531263cb561cba5f24;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 88bbbda..81c1939 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -69,33 +69,41 @@ jQuery.event = {
 					this.remove( element, j );
 	},
 
-	trigger: function(type,data,element) {
+	trigger: function(type, data, element) {
 		// Clone the incoming data, if any
 		data = jQuery.makeArray(data || []);
 
 		// Handle a global trigger
-		if ( !element ) {
-			var g = this.global[type];
-			if ( g )
-				jQuery.each( g, function(){
-					jQuery.event.trigger( type, data, this );
-				});
+		if ( !element )
+			jQuery.each( this.global[type] || [], function(){
+				jQuery.event.trigger( type, data, this );
+			});
 
 		// Handle triggering a single element
-		} else if ( element["on" + type] ) {
-			// Pass along a fake event
-			data.unshift( this.fix({ type: type, target: element }) );
+		else {
+			var handler = element["on" + type ], val,
+				fn = jQuery.isFunction( element[ type ] );
+
+			if ( handler ) {
+				// Pass along a fake event
+				data.unshift( this.fix({ type: type, target: element }) );
 	
-			// Trigger the event
-			var val = element["on" + type].apply( element, data );
+				// Trigger the event
+				if ( (val = handler.apply( element, data )) !== false )
+					this.triggered = true;
+			}
 
-			if ( val !== false && jQuery.isFunction( element[ type ] ) )
+			if ( fn && val !== false )
 				element[ type ]();
+
+			this.triggered = false;
 		}
 	},
 
 	handle: function(event) {
-		if ( typeof jQuery == "undefined" ) return false;
+		// Handle the second event of a trigger and when
+		// an event is called after a page has unloaded
+		if ( typeof jQuery == "undefined" || jQuery.event.triggered ) return;
 
 		// Empty object is for triggered events with no data
 		event = jQuery.event.fix( event || window.event || {} ); 
@@ -305,9 +313,19 @@ jQuery.fn.extend({
 	 * @before <p click="alert('hello')">Hello</p>
 	 * @result alert('hello')
 	 *
+	 * @example $("p").click(function(event, a, b) {
+	 *   // when a normal click fires, a and b are undefined
+	 *   // for a trigger like below a refers too "foo" and b refers to "bar"
+	 * }).trigger("click", ["foo", "bar"]);
+	 * @desc Example of how to pass arbitrary to an event
+	 * 
+	 * @before <p click="alert('hello')">Hello</p>
+	 * @result alert('hello')
+	 *
 	 * @name trigger
 	 * @type jQuery
 	 * @param String type An event type to trigger.
+	 * @param Array data (optional) Additional data to pass as arguments (after the event object) to the event handler
 	 * @cat Events
 	 */
 	trigger: function( type, data ) {