Added a new extra fn arg to trigger (so you don't have to simulate the trigger yourse...

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

diff --git a/src/event/event.js b/src/event/event.js
index 9dff1b2..3c5a119 100644 (file)
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -122,7 +122,7 @@ jQuery.event = {
                }
        },
 
-       trigger: function(type, data, element) {
+       trigger: function(type, data, element, native, extra) {
                // Clone the incoming data, if any
                data = jQuery.makeArray(data || []);
 
@@ -147,8 +147,12 @@ jQuery.event = {
                        if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
                                val = false;
 
+                       // Handle triggering of extra function
+                       if ( extra && extra.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") ) {
+                       if ( fn && native !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
                                this.triggered = true;
                                element[ type ]();
                        }
@@ -412,12 +416,17 @@ jQuery.fn.extend({
         * @param Array data (optional) Additional data to pass as arguments (after the event object) to the event handler
         * @cat Events
         */
-       trigger: function( type, data ) {
+       trigger: function( type, data, fn ) {
                return this.each(function(){
-                       jQuery.event.trigger( type, data, this );
+                       jQuery.event.trigger( type, data, this, true, fn );
                });
        },
 
+       triggerHandler: function( type, data, fn ) {
+               if ( this[0] )
+                       return jQuery.event.trigger( type, data, this[0], false, fn );
+       },
+
        /**
         * Toggle between two function calls every other click.
         * Whenever a matched element is clicked, the first specified function