diff options
| author | John Resig <jeresig@gmail.com> | 2007-01-13 22:29:59 +0000 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2007-01-13 22:29:59 +0000 |
| commit | 79c58b8406128b33080d72059dff66f49d64114c (patch) | |
| tree | f29d295fb33539280b86ecaca73b9cf128504753 /src/event/event.js | |
| parent | dfa1a0246f0249056f3ce85f62a61e609f20fd07 (diff) | |
| download | jquery-79c58b8406128b33080d72059dff66f49d64114c.tar.gz jquery-79c58b8406128b33080d72059dff66f49d64114c.zip | |
Added a fix for triggered events not being cancellable. (You couldn't return false to stop a .submit(), for example.)
Diffstat (limited to 'src/event/event.js')
| -rw-r--r-- | src/event/event.js | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/event/event.js b/src/event/event.js index b9f130b6c..702c4d332 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -82,15 +82,14 @@ jQuery.event = { // Handle triggering a single element } else if ( element["on" + type] ) { - if ( element[ type ] && element[ type ].constructor == Function ) - element[ type ](); - else { - // Pass along a fake event - data.unshift( this.fix({ type: type, target: element }) ); + // Pass along a fake event + data.unshift( this.fix({ type: type, target: element }) ); - // Trigger the event - element["on" + type].apply( element, data ); - } + // Trigger the event + var val = element["on" + type].apply( element, data ); + + if ( val !== false && element[ type ] && element[ type ].constructor == Function ) + element[ type ](); } }, |