X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=8d69807e57067b1e1914cfbc2345564708bc958b;hb=8e40a84c24271c0a9253902ceb97185f243a3318;hp=21ed63166e11abb9182bd5a1448c1a49419cc01c;hpb=4490f4285cc4cdafba67fee726d3eba4a3d81a0f;p=jquery.git diff --git a/test/unit/event.js b/test/unit/event.js index 21ed631..8d69807 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -361,9 +361,7 @@ test("bind(), trigger change on select", function() { }).trigger('change'); }); -test("bind(), namespaced events, cloned events", function() { - expect(6); - +test("bind(), namespaced events, cloned events", 18, function() { var firstp = jQuery( "#firstp" ); firstp.bind("custom.test",function(e){ @@ -372,22 +370,31 @@ test("bind(), namespaced events, cloned events", function() { firstp.bind("click",function(e){ 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){ + var check = "click"; 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"); - // Trigger one bound fn (1) + // Trigger one bound fn (4) firstp.trigger("click.test"); // Remove only the one fn firstp.unbind("click.test"); - // Trigger the remaining fn (1) + // Trigger the remaining fn (4) firstp.trigger("click"); // Remove the remaining namespaced fn @@ -402,7 +409,7 @@ test("bind(), namespaced events, cloned events", function() { }).trigger("tester"); // Make sure events stick with appendTo'd elements (which are cloned) #2027 - jQuery("test").click(function(){ return false; }).appendTo("p"); + jQuery("test").click(function(){ return false; }).appendTo("#main"); ok( jQuery("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" ); });