Skip to content
Permalink
Browse files

Added a new extra fn arg to trigger (so you don't have to simulate th…

…e trigger yourself). (Bug #1467) Added a new .triggerHandler() method that allows you to NOT trigger native calls AND returns the response from the handlers. (Bug #873 & #1417)
  • Loading branch information
jeresig committed Aug 30, 2007
1 parent 15faf78 commit 042a46386a4e5efe787f963245aa534663559838
Showing with 46 additions and 9 deletions.
  1. +13 −4 src/event/event.js
  2. +33 −5 src/event/eventTest.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
@@ -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();
});
});

0 comments on commit 042a463

Please sign in to comment.
You can’t perform that action at this time.