Added a fix for triggered events not being cancellable. (You couldn't return false...
authorJohn Resig <jeresig@gmail.com>
Sat, 13 Jan 2007 22:29:59 +0000 (22:29 +0000)
committerJohn Resig <jeresig@gmail.com>
Sat, 13 Jan 2007 22:29:59 +0000 (22:29 +0000)
src/event/event.js

index b9f130b..702c4d3 100644 (file)
@@ -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 ]();
                }
        },