X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=7ac3a6efbd52cd1331c60026d131761b7872f357;hb=e6c067858ec7f2c4e3e7da90f16c695f93a4ee07;hp=8d83216181e3f9dd7fae047e88a7faf171ce9f78;hpb=11b64c1149a0d49d105b50a2869d74cbe18613ed;p=jquery.git
diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index 8d83216..7ac3a6e 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -7,7 +7,9 @@ test("bind()", function() {
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) {
@@ -51,7 +48,7 @@ test("bind()", function() {
});
test("click()", function() {
- expect(3);
+ expect(4);
$('Change location').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" );
@@ -62,6 +59,13 @@ test("click()", function() {
$("#check1").click(function() {
ok( true, "click event handler for checkbox gets fired twice, see #815" );
}).click();
+
+ var counter = 0;
+ $('#firstp')[0].onclick = function(event) {
+ counter++;
+ };
+ $('#firstp').click();
+ ok( counter == 1, "Check that click, triggers onclick event handler also" );
});
test("unbind(event)", function() {