Added in jQuery.isFunction().

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

diff --git a/src/event/event.js b/src/event/event.js
index b9f130b..63a8a7c 100644 (file)
--- 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 && jQuery.isFunction( element[ type ] ) )
+                               element[ type ]();
                }
        },