github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-04-20 03:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #8858. Pass the .trigger(..., data) to the event.special._default method.

Browse Source
This commit is contained in:
Dave Methvin
2011-08-02 22:50:58 -04:00
committed by timmywil
parent d74c6bd0f4
commit 0dc7b16e94
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/event.js
View File

@@ -346,7 +346,7 @@ jQuery.event = {
if ( !event.isDefaultPrevented() ) {
special = jQuery.event.special[ type ] || {};
if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) &&
if ( (!special._default || special._default.call( elem.ownerDocument, event, data ) === false) &&
!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
// Call a native DOM method on the target with the same name name as the event.

11
test/unit/event.js
View File

@@ -148,7 +148,7 @@ test("bind(), multiple events at once and namespaces", function() {
});
test("bind(), namespace with special add", function() {
expect(24);
expect(27);
var div = jQuery("<div/>").bind("test", function(e) {
ok( true, "Test event fired." );
@@ -157,10 +157,11 @@ test("bind(), namespace with special add", function() {
var i = 0;
jQuery.event.special.test = {
_default: function(e) {
_default: function(e, data) {
equals( this, document, "Make sure we're at the top of the chain." );
equals( e.type, "test", "And that we're still dealing with a test event." );
equals( e.target, div[0], "And that the target is correct." );
ok( data !== undefined , "And that trigger data was passed." );
},
setup: function(){},
teardown: function(){
@@ -189,13 +190,13 @@ test("bind(), namespace with special add", function() {
});
// Should trigger 5
div.trigger("test");
div.trigger("test", 33.33);
// Should trigger 2
div.trigger("test.a");
div.trigger("test.a", "George Harrison");
// Should trigger 2
div.trigger("test.b");
div.trigger("test.b", { year: 1982 });
// Should trigger 4
div.unbind("test");