X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=src%2Fevent%2FeventTest.js;h=cacfdeb666f25006e3eb083961fe8984a361d004;hb=456f0fe5985eaad42eba456b9ff710771669607c;hp=8d83216181e3f9dd7fae047e88a7faf171ce9f78;hpb=11b64c1149a0d49d105b50a2869d74cbe18613ed;p=jquery.git diff --git a/src/event/eventTest.js b/src/event/eventTest.js index 8d83216..cacfdeb 100644 --- a/src/event/eventTest.js +++ b/src/event/eventTest.js @@ -1,13 +1,15 @@ module("event"); test("bind()", function() { - expect(11); + expect(15); var handler = function(event) { ok( event.data, "bind() with data, check passed data exists" ); ok( event.data.foo == "bar", "bind() with data, Check value of passed data" ); }; - $("#firstp").bind("click", {foo: "bar"}, handler).click(); + $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler); + + ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." ); reset(); var handler = function(event, data) { @@ -16,30 +18,25 @@ test("bind()", function() { ok( data, "Check trigger data" ); ok( data.bar == "foo", "Check value of trigger data" ); }; - $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]); + $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler); + reset(); var handler = function(event) { ok ( !event.data, "Check that no data is added to the event object" ); }; - $("#firstp").unbind().bind("click", handler).trigger("click"); + $("#firstp").bind("click", handler).trigger("click"); - // events don't work with iframes, see #939 - var tmp = document.createElement('iframe'); - document.body.appendChild( tmp ); - var doc = tmp.contentWindow.document; - doc.open(); - doc.write("
"); - doc.close(); - - var input = doc.getElementsByTagName("input")[0]; - - $(input).bind("click",function() { - ok( true, "Binding to element inside iframe" ); - }); - - triggerEvent( input, "click" ); - - document.body.removeChild( tmp ); + + // events don't work with iframes, see #939 - this test fails in IE because of contentDocument + // var doc = document.getElementById("iframe").contentDocument; + // + // doc.body.innerHTML = ""; + // + // var input = doc.getElementsByTagName("input")[0]; + // + // $(input).bind("click",function() { + // ok( true, "Binding to element inside iframe" ); + // }).click(); var counter = 0; function selectOnChange(event) { @@ -48,10 +45,32 @@ test("bind()", function() { $("select").each(function(i){ $(this).bind('change', i, selectOnChange); }).trigger('change'); + + reset(); + + $("#firstp").bind("click",function(e){ + ok(true, "Normal click triggered"); + }); + + $("#firstp").bind("click.test",function(e){ + ok(true, "Namespaced click triggered"); + }); + + // Trigger both bound fn (2) + $("#firstp").trigger("click"); + + // Trigger one bound fn (1) + $("#firstp").trigger("click.test"); + + // Remove only the one fn + $("#firstp").unbind("click.test"); + + // Trigger the remaining fn (1) + $("#firstp").trigger("click"); }); test("click()", function() { - expect(3); + expect(4); $('