X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=a948bfcfd02e878d14764c9a35bcd25e7c438460;hb=6c072457ed36464f7f2bc15128e69206dbac5d24;hp=88bbbda2b31771f0daafacb28bbb33614c34b889;hpb=34355cd6986d5939dc711c531263cb561cba5f24;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 88bbbda..a948bfc 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -74,28 +74,34 @@ jQuery.event = {
 		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] ) {
+		else if ( element["on" + type] ) {
 			// Pass along a fake event
 			data.unshift( this.fix({ type: type, target: element }) );
 	
 			// Trigger the event
 			var val = element["on" + type].apply( element, data );
 
-			if ( val !== false && jQuery.isFunction( element[ type ] ) )
+			if ( val !== false && jQuery.isFunction( element[ type ] ) ) {
+				this.triggered = true;
 				element[ type ]();
+			}
 		}
 	},
 
 	handle: function(event) {
-		if ( typeof jQuery == "undefined" ) return false;
+		if ( typeof jQuery == "undefined" ) return;
+
+		// Handle the second event of a trigger
+		if ( jQuery.event.triggered ) {
+			jQuery.event.triggered = false;
+			return;
+		}
 
 		// Empty object is for triggered events with no data
 		event = jQuery.event.fix( event || window.event || {} );