X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevent%2FeventTest.js;h=7ac3a6efbd52cd1331c60026d131761b7872f357;hb=4d4f13a96b65b31eea9dd6c706324274d97cbb36;hp=0ad4ffb7211038981f02a59d050750c9d182cdfc;hpb=d7a8794eb574a870fde9a8afdfd452e52804f65d;p=jquery.git diff --git a/src/event/eventTest.js b/src/event/eventTest.js index 0ad4ffb..7ac3a6e 100644 --- a/src/event/eventTest.js +++ b/src/event/eventTest.js @@ -6,8 +6,10 @@ test("bind()", function() { 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) { @@ -15,52 +17,55 @@ test("bind()", function() { ok( event.data.foo == "bar", "Check value of passed data" ); 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").bind("click", handler).trigger("click"); + + + // 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(); - // events don't work with iframes, see #939 - var tmp = document.createElement('iframe'); - document.body.appendChild( tmp ); - var doc = tmp.contentDocument; - doc.open(); - doc.write("
"); - doc.close(); - - var input = doc.getElementsByTagName("input")[0]; - - input.addEventListener('click', function() { - ok( true, "Event handling via DOM 2 methods" ); - }, false); - - $(input).bind("click",function() { - ok( true, "Event handling via jQuery's handler" ); - }); - - triggerEvent( input, "click" ); - - document.body.removeChild( tmp ); - var counter = 0; function selectOnChange(event) { - equals( event.data, counter++, "Event.data is a global event object" ); - } + equals( event.data, counter++, "Event.data is not a global event object" ); + }; $("select").each(function(i){ $(this).bind('change', i, selectOnChange); }).trigger('change'); }); test("click()", function() { - expect(3); - $('