Commit 15faf783 authored by John Resig's avatar John Resig

Made jQuery's internal trigger method return the value from handle. (Bug #1417)

parent 25e83d27
......@@ -142,9 +142,12 @@ jQuery.event = {
// Trigger the event
if ( jQuery.isFunction( element.$handle ) )
val = element.$handle.apply( element, data );
// Handle triggering native .onfoo handlers
if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
val = false;
// Trigger the native events (except for clicks on links)
if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
this.triggered = true;
element[ type ]();
......@@ -152,6 +155,8 @@ jQuery.event = {
this.triggered = false;
}
return val;
},
handle: function(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