Commit df4a160b authored by Dave Methvin's avatar Dave Methvin

Pass correct arg list to special._default. Thanks @mikaelkaron!

parent 736d4d77
...@@ -365,7 +365,7 @@ jQuery.event = { ...@@ -365,7 +365,7 @@ jQuery.event = {
// If nobody prevented the default action, do it now // If nobody prevented the default action, do it now
if ( !event.isDefaultPrevented() ) { if ( !event.isDefaultPrevented() ) {
if ( (!special._default || special._default.call( elem.ownerDocument, event, data ) === false) && if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { !(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. // Call a native DOM method on the target with the same name name as the event.
......
...@@ -1753,8 +1753,8 @@ test("live with special events", function() { ...@@ -1753,8 +1753,8 @@ test("live with special events", function() {
remove: function( handleObj ) { remove: function( handleObj ) {
ok( true, "Remove run." ); ok( true, "Remove run." );
}, },
_default: function( event ) { _default: function( event, arg ) {
ok( true, "Default run." ); ok( event.type === "foo" && arg == 42, "Default run with correct args." );
} }
}; };
...@@ -1769,16 +1769,16 @@ test("live with special events", function() { ...@@ -1769,16 +1769,16 @@ test("live with special events", function() {
}); });
// Run: Handler 1, Handler 2, Default // Run: Handler 1, Handler 2, Default
jQuery("#liveSpan1").trigger("foo"); jQuery("#liveSpan1").trigger("foo", 42);
// Run: Handler 1, Default // Run: Handler 1, Default
jQuery("#liveSpan1").trigger("foo.a"); jQuery("#liveSpan1").trigger("foo.a", 42);
// Run: remove // Run: remove
jQuery("#liveSpan1").die("foo.a"); jQuery("#liveSpan1").die("foo.a");
// Run: Handler 2, Default // Run: Handler 2, Default
jQuery("#liveSpan1").trigger("foo"); jQuery("#liveSpan1").trigger("foo", 42);
// Run: remove, teardown // Run: remove, teardown
jQuery("#liveSpan1").die("foo"); jQuery("#liveSpan1").die("foo");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment