Permalink
Browse files

Fix #11130: Don't neglect the data arg when event-map is passed.

  • Loading branch information...
1 parent d828996 commit c0da49ff37484764bd0f33fe40d1a5f83d0f39e8 @rwaldron rwaldron committed with dmethvin Jan 13, 2012
Showing with 21 additions and 5 deletions.
  1. +2 −2 src/event.js
  2. +19 −3 test/unit/event.js
View
@@ -867,9 +867,9 @@ jQuery.fn.extend({
// Types can be a map of types/handlers
if ( typeof types === "object" ) {
// ( types-Object, selector, data )
- if ( typeof selector !== "string" ) {
+ if ( typeof selector !== "string" ) { // && selector != null
// ( types-Object, data )
- data = selector;
+ data = data || selector;
selector = undefined;
}
for ( type in types ) {
View
@@ -1197,7 +1197,7 @@ test("Delegated events in SVG (#10791)", function() {
'<rect id="svg-by-id" x="10" y="20" width="100" height="60" r="10" rx="10" ry="10"></rect>'+
'</svg>'
).appendTo( "body" );
-
+
jQuery( "body" )
.on( "click", "#svg-by-id", function() {
ok( true, "delegated id selector" );
@@ -2601,7 +2601,7 @@ test("special bind/delegate name mapping", function() {
// Ensure .one() events are removed after their maiden voyage
jQuery( '<p>Gut Feeling</p>' )
.one( "gutfeeling", jQuery.noop )
- .trigger( "gutfeeling" ) // This one should
+ .trigger( "gutfeeling" ) // This one should
.trigger( "gutfeeling" ) // This one should not
.remove();
@@ -2616,7 +2616,7 @@ test(".on and .off, selective mixed removal (#10705)", function() {
ok( true, "triggered " + e.type );
};
- jQuery( '<p>Strange Pursuit</p>' )
+ jQuery( "<p>Strange Pursuit</p>" )
.on( "click", timingx )
.on( "click.duty", timingx )
.on( "click.now", timingx )
@@ -2631,6 +2631,22 @@ test(".on and .off, selective mixed removal (#10705)", function() {
.trigger( "click" ); // 0
});
+test(".on( event-map, null-selector, data ) #11130", function() {
+
+ expect( 1 );
+
+ var $p = jQuery("<p>Strange Pursuit</p>"),
+ data = "bar",
+ map = {
+ "foo": function( event ) {
+ equal( event.data, "bar", "event.data correctly relayed with null selector" );
+ $p.remove();
+ }
+ };
+
+ $p.on( map, null, data ).trigger("foo");
+});
+
test("delegated events quickIs", function() {
expect(14);
var markup = jQuery(

0 comments on commit c0da49f

Please sign in to comment.