diff options
| author | Brandon Aaron <brandon.aaron@gmail.com> | 2007-07-21 01:04:59 +0000 |
|---|---|---|
| committer | Brandon Aaron <brandon.aaron@gmail.com> | 2007-07-21 01:04:59 +0000 |
| commit | 24463a04ce5612f4007263f9af0d1e4d7568ed9a (patch) | |
| tree | 76b9a25f1aa98f2cd36077dc15705cbcb214c840 /src/event/event.js | |
| parent | e20e8e6e3cc565469cedfad105565ce534c98c71 (diff) | |
| download | jquery-24463a04ce5612f4007263f9af0d1e4d7568ed9a.tar.gz jquery-24463a04ce5612f4007263f9af0d1e4d7568ed9a.zip | |
trigger DOM0 event handlers when doing a trigger (#1363)
Diffstat (limited to 'src/event/event.js')
| -rw-r--r-- | src/event/event.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/event/event.js b/src/event/event.js index f264a2cd2..b13e5a02f 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -148,11 +148,15 @@ jQuery.event = { data.unshift( this.fix({ type: type, target: element }) ); // Trigger the event - if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false ) - this.triggered = true; + if ( jQuery.isFunction( element.$handle ) ) + val = element.$handle.apply( element, data ); + if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false ) + val = false; - if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) + if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) { + this.triggered = true; element[ type ](); + } this.triggered = false; } |