trigger DOM0 event handlers when doing a trigger (#1363)

[jquery.git] / src / event / event.js

diff --git a/src/event/event.js b/src/event/event.js
index f264a2c..b13e5a0 100644 (file)
--- 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;
                }