Made jQuery's internal trigger method return the value from handle. (Bug #1417)
authorJohn Resig <jeresig@gmail.com>
Tue, 28 Aug 2007 04:42:35 +0000 (04:42 +0000)
committerJohn Resig <jeresig@gmail.com>
Tue, 28 Aug 2007 04:42:35 +0000 (04:42 +0000)
src/event/event.js

index 7f0ec64..9dff1b2 100644 (file)
@@ -142,9 +142,12 @@ jQuery.event = {
                        // Trigger the event
                        if ( jQuery.isFunction( element.$handle ) )
                                val = element.$handle.apply( element, data );
+
+                       // Handle triggering native .onfoo handlers
                        if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
                                val = false;
 
+                       // Trigger the native events (except for clicks on links)
                        if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
                                this.triggered = true;
                                element[ type ]();
@@ -152,6 +155,8 @@ jQuery.event = {
 
                        this.triggered = false;
                }
+
+               return val;
        },
 
        handle: function(event) {