X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=6335925277a5c04e7df98122a6118ab49d2a6a57;hb=e0aa10a664aabbc9ab900a07ea55cb892a7b8d3f;hp=0ad4ffb7211038981f02a59d050750c9d182cdfc;hpb=d7a8794eb574a870fde9a8afdfd452e52804f65d;p=jquery.git diff --git a/src/event/eventTest.js b/src/event/eventTest.js index 0ad4ffb..6335925 100644 --- a/src/event/eventTest.js +++ b/src/event/eventTest.js @@ -1,7 +1,7 @@ module("event"); test("bind()", function() { - expect(11); + expect(9); var handler = function(event) { ok( event.data, "bind() with data, check passed data exists" ); @@ -17,32 +17,10 @@ test("bind()", function() { ok( data.bar == "foo", "Check value of trigger data" ); } $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]); - - // 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); @@ -50,17 +28,17 @@ test("bind()", function() { }); test("click()", function() { - expect(3); - $('

').prependTo('#firstUL').find('a').bind('click', function() { - var close = $('spanx', this); // same with $(this).find('span'); - ok( close.length == 0, "Context element does not exist, length must be zero" ); - ok( !close[0], "Context element does not exist, direct access to element must return undefined" ); - return false; + expect(3); + $('

').prependTo('#firstUL').find('a').bind('click', function() { + var close = $('spanx', this); // same with $(this).find('span'); + ok( close.length == 0, "Context element does not exist, length must be zero" ); + ok( !close[0], "Context element does not exist, direct access to element must return undefined" ); + return false; }).click(); $("#check1").click(function() { ok( true, "click event handler for checkbox gets fired twice, see #815" ); - }).click(); + }).click(); }); test("unbind(event)", function() { @@ -81,7 +59,8 @@ test("unbind(event)", function() { el.click(function() { return; }); el.unbind('change',function(){ return; }); - ok( el[0].onclick, "Extra handlers weren't accidentally removed." ); + for (var ret in el[0].$events['click']) break; + ok( ret, "Extra handlers weren't accidentally removed." ); el.unbind('click'); ok( !el[0].$events, "Removed the events expando after all handlers are unbound." ); @@ -104,10 +83,7 @@ test("toggle(Function, Function)", function() { fn2 = function(e) { count--; }, preventDefault = function(e) { e.preventDefault() }, link = $('#mark'); - if ( $.browser.msie || $.browser.opera || /konquerer/i.test(navigator.userAgent) ) - ok( false, "click() on link gets executed in IE/Opera/Konquerer, not intended behaviour!" ); - else - link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click(); + link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click(); ok( count == 1, "Check for toggle(fn, fn)" ); var first = 0;