X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=a948bfcfd02e878d14764c9a35bcd25e7c438460;hb=6c72f188cd8a7f98a10904b754eb4495f46af503;hp=812b8923d4a78e2beaaa5832fc9879e72e272064;hpb=e45dbf29f88fb965c0abd039a65bc0302dea7e43;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 812b892..a948bfc 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -87,13 +87,21 @@ jQuery.event = {
 			// 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 || {} );