Commit d2f9022a authored by John Resig's avatar John Resig

Refactored the trigger code a little bit.

parent 23220321
...@@ -80,29 +80,30 @@ jQuery.event = { ...@@ -80,29 +80,30 @@ jQuery.event = {
}); });
// Handle triggering a single element // Handle triggering a single element
else if ( element["on" + type] ) { else {
// Pass along a fake event var handler = element["on" + type ], val,
data.unshift( this.fix({ type: type, target: element }) ); fn = jQuery.isFunction( element[ type ] );
if ( handler ) {
// Pass along a fake event
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event // Trigger the event
var val = element["on" + type].apply( element, data ); if ( (val = handler.apply( element, data )) !== false )
this.triggered = true;
}
if ( val !== false && jQuery.isFunction( element[ type ] ) ) { if ( fn && val !== false )
this.triggered = true;
element[ type ](); element[ type ]();
}
} else if ( jQuery.isFunction( element[ type ] ) ) this.triggered = false;
element[ type ](); }
}, },
handle: function(event) { handle: function(event) {
if ( typeof jQuery == "undefined" ) return; // Handle the second event of a trigger and when
// an event is called after a page has unloaded
// Handle the second event of a trigger if ( typeof jQuery == "undefined" || jQuery.event.triggered ) return;
if ( jQuery.event.triggered ) {
jQuery.event.triggered = false;
return;
}
// Empty object is for triggered events with no data // Empty object is for triggered events with no data
event = jQuery.event.fix( event || window.event || {} ); event = jQuery.event.fix( event || window.event || {} );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment