library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rick Waldron 2012-01-12 20:30:45 -05:00 committed by Dave Methvin
parent d828996478
commit c0da49ff37
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/event.js
View File

@ -867,9 +867,9 @@ jQuery.fn.extend({
// Types can be a map of types/handlers // Types can be a map of types/handlers
if ( typeof types === "object" ) { if ( typeof types === "object" ) {
// ( types-Object, selector, data ) // ( types-Object, selector, data )
if ( typeof selector !== "string" ) { if ( typeof selector !== "string" ) { // && selector != null
// ( types-Object, data ) // ( types-Object, data )
data = selector; data = data || selector;
selector = undefined; selector = undefined;
} }
for ( type in types ) { for ( type in types ) {

18
test/unit/event.js
View File

@ -2616,7 +2616,7 @@ test(".on and .off, selective mixed removal (#10705)", function() {
ok( true, "triggered " + e.type ); ok( true, "triggered " + e.type );
}; };
jQuery( '<p>Strange Pursuit</p>' ) jQuery( "<p>Strange Pursuit</p>" )
.on( "click", timingx ) .on( "click", timingx )
.on( "click.duty", timingx ) .on( "click.duty", timingx )
.on( "click.now", timingx ) .on( "click.now", timingx )
@ -2631,6 +2631,22 @@ test(".on and .off, selective mixed removal (#10705)", function() {
.trigger( "click" ); // 0 .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() { test("delegated events quickIs", function() {
expect(14); expect(14);
var markup = jQuery( var markup = jQuery(