aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-10-27 16:02:54 -0400
committerDave Methvin <dave.methvin@gmail.com>2011-10-27 16:02:54 -0400
commitdf4a160be7fcc234a8e17eccb1c3fd02f231bcfc (patch)
tree239226234d686dc146b62d06f2007606bd6f7a5a
parent736d4d770633720493afe1fefd6f135095c5b5f7 (diff)
downloadjquery-df4a160be7fcc234a8e17eccb1c3fd02f231bcfc.tar.gz
jquery-df4a160be7fcc234a8e17eccb1c3fd02f231bcfc.zip
Pass correct arg list to special._default. Thanks @mikaelkaron!
-rw-r--r--src/event.js2
-rw-r--r--test/unit/event.js10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/event.js b/src/event.js
index 3576bffca..dcbeb4b7f 100644
--- a/src/event.js
+++ b/src/event.js
@@ -365,7 +365,7 @@ jQuery.event = {
// If nobody prevented the default action, do it now
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 ) ) {
// Call a native DOM method on the target with the same name name as the event.
diff --git a/test/unit/event.js b/test/unit/event.js
index 35664b022..246bde322 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1753,8 +1753,8 @@ test("live with special events", function() {
remove: function( handleObj ) {
ok( true, "Remove run." );
},
- _default: function( event ) {
- ok( true, "Default run." );
+ _default: function( event, arg ) {
+ ok( event.type === "foo" && arg == 42, "Default run with correct args." );
}
};
@@ -1769,16 +1769,16 @@ test("live with special events", function() {
});
// Run: Handler 1, Handler 2, Default
- jQuery("#liveSpan1").trigger("foo");
+ jQuery("#liveSpan1").trigger("foo", 42);
// Run: Handler 1, Default
- jQuery("#liveSpan1").trigger("foo.a");
+ jQuery("#liveSpan1").trigger("foo.a", 42);
// Run: remove
jQuery("#liveSpan1").die("foo.a");
// Run: Handler 2, Default
- jQuery("#liveSpan1").trigger("foo");
+ jQuery("#liveSpan1").trigger("foo", 42);
// Run: remove, teardown
jQuery("#liveSpan1").die("foo");