deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure .clone(true) correctly clones namespaced events. Fixes #4537.

Browse source
This commit is contained in:
Anton M 2011-02-10 03:18:11 +01:00
parent 4490f4285c
commit 78fc79fad4
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/manipulation.js
View file

@ -368,7 +368,7 @@ function cloneCopyEvent( src, dest ) {
for ( var type in events ) { for ( var type in events ) {
for ( var i = 0, l = events[ type ].length; i < l; i++ ) { for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
jQuery.event.add( dest, type, events[ type ][ i ], events[ type ][ i ].data ); jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
} }
} }
} }

19
test/unit/event.js
View file

@ -361,9 +361,7 @@ test("bind(), trigger change on select", function() {
}).trigger('change'); }).trigger('change');
}); });
test("bind(), namespaced events, cloned events", function() { test("bind(), namespaced events, cloned events", 18, function() {
expect(6);
var firstp = jQuery( "#firstp" ); var firstp = jQuery( "#firstp" );
firstp.bind("custom.test",function(e){ firstp.bind("custom.test",function(e){
@ -372,22 +370,31 @@ test("bind(), namespaced events, cloned events", function() {
firstp.bind("click",function(e){ firstp.bind("click",function(e){
ok(true, "Normal click triggered"); ok(true, "Normal click triggered");
equal( e.type + e.namespace, "click", "Check that only click events trigger this fn" );
}); });
firstp.bind("click.test",function(e){ firstp.bind("click.test",function(e){
var check = "click";
ok( true, "Namespaced click triggered" ); ok( true, "Namespaced click triggered" );
if ( e.namespace ) {
check += "test";
}
equal( e.type + e.namespace, check, "Check that only click/click.test events trigger this fn" );
}); });
// Trigger both bound fn (2) //clone(true) element to verify events are cloned correctly
firstp = firstp.add( firstp.clone( true ).attr( "id", "firstp2" ).insertBefore( firstp ) );
// Trigger both bound fn (8)
firstp.trigger("click"); firstp.trigger("click");
// Trigger one bound fn (1) // Trigger one bound fn (4)
firstp.trigger("click.test"); firstp.trigger("click.test");
// Remove only the one fn // Remove only the one fn
firstp.unbind("click.test"); firstp.unbind("click.test");
// Trigger the remaining fn (1) // Trigger the remaining fn (4)
firstp.trigger("click"); firstp.trigger("click");
// Remove the remaining namespaced fn // Remove the remaining namespaced fn