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

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 

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index 7ac3a6e..84c7b97 100644 (file)
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -94,13 +94,41 @@ test("unbind(event)", function() {
 });
 
 test("trigger(event, [data]", function() {
-       expect(3);
+       expect(28);
+
        var handler = function(event, a, b, c) {
-               ok( a == 1, "check passed data" );
-               ok( b == "2", "check passed data" );
-               ok( c == "abc", "check passed data" );
+               equals( event.type, "click", "check passed data" );
+               equals( a, 1, "check passed data" );
+               equals( b, "2", "check passed data" );
+               equals( c, "abc", "check passed data" );
+               return "test";
+       };
+
+       // Simulate a "native" click
+       $("#firstp")[0].click = function(){
+               ok( true, "Native call was triggered" );
        };
+
+       // Triggers handlrs and native
+       // Trigger 5
        $("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+
+       // Triggers handlers, native, and extra fn
+       // Triggers 9
+       $("#firstp").trigger("click", [1, "2", "abc"], handler);
+
+       // Simulate a "native" click
+       $("#firstp")[0].click = function(){
+               ok( false, "Native call was triggered" );
+       };
+
+       // Trigger only the handlers (no native)
+       // Triggers 4
+       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+
+       // Trigger only the handlers (no native) and extra fn
+       // Triggers 8
+       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler), "test", "Verify handler response" );
 });
 
 test("toggle(Function, Function)", function() {
@@ -123,4 +151,4 @@ test("toggle(Function, Function)", function() {
                });
                return false;
        }).click().click().click();
-});
\ No newline at end of file
+});