aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/event/event.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/event/event.js b/src/event/event.js
index 812b8923d..a948bfcfd 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 || {} );