From 79c58b8406128b33080d72059dff66f49d64114c Mon Sep 17 00:00:00 2001 From: John Resig Date: Sat, 13 Jan 2007 22:29:59 +0000 Subject: [PATCH] Added a fix for triggered events not being cancellable. (You couldn't return false to stop a .submit(), for example.) --- src/event/event.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/event/event.js b/src/event/event.js index b9f130b..702c4d3 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 ](); } }, -- 1.7.10.4