diff options
| author | John Resig <jeresig@gmail.com> | 2007-08-28 04:42:35 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-08-28 04:42:35 +0000 |
| commit | 15faf783b9c3c454868b5054fdcfb63e8950abf9 (patch) | |
| tree | 0e2a39306d8f5f3dcf93d36c0773c87a0b78a2d5 /src/event | |
| parent | 25e83d27cb20ba8aa5dec7fec2d05e4da52d9fee (diff) | |
| download | jquery-15faf783b9c3c454868b5054fdcfb63e8950abf9.tar.gz jquery-15faf783b9c3c454868b5054fdcfb63e8950abf9.zip | |
Made jQuery's internal trigger method return the value from handle. (Bug #1417)
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/event.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/event/event.js b/src/event/event.js index 7f0ec64e5..9dff1b2cd 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -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) { |