X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=84c7b97d9f59fd96e5dab42e23a993d6cb8c224c;hb=042a46386a4e5efe787f963245aa534663559838;hp=15e66313e8c56a3906c29db6950d7c378d9a1637;hpb=2897b1bd2383031b6764192dc1ccb1d1205139a3;p=jquery.git
diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index 15e6631..84c7b97 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -1,7 +1,7 @@
module("event");
test("bind()", function() {
- expect(12);
+ expect(11);
var handler = function(event) {
ok( event.data, "bind() with data, check passed data exists" );
@@ -27,23 +27,16 @@ test("bind()", function() {
$("#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) {
@@ -55,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" );
@@ -66,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() {
@@ -94,13 +94,41 @@ test("unbind(event)", function() {
});
test("trigger(event, [data]", function() {
- expect(3);
+ expect(28);
+
var handler = function(event, a, b, c) {
- ok( a == 1, "check passed data" );
- ok( b == "2", "check passed data" );
- ok( c == "abc", "check passed data" );
+ equals( event.type, "click", "check passed data" );
+ equals( a, 1, "check passed data" );
+ equals( b, "2", "check passed data" );
+ equals( c, "abc", "check passed data" );
+ return "test";
+ };
+
+ // Simulate a "native" click
+ $("#firstp")[0].click = function(){
+ ok( true, "Native call was triggered" );
};
+
+ // Triggers handlrs and native
+ // Trigger 5
$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+
+ // Triggers handlers, native, and extra fn
+ // Triggers 9
+ $("#firstp").trigger("click", [1, "2", "abc"], handler);
+
+ // Simulate a "native" click
+ $("#firstp")[0].click = function(){
+ ok( false, "Native call was triggered" );
+ };
+
+ // Trigger only the handlers (no native)
+ // Triggers 4
+ equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+
+ // Trigger only the handlers (no native) and extra fn
+ // Triggers 8
+ equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler), "test", "Verify handler response" );
});
test("toggle(Function, Function)", function() {
@@ -123,4 +151,4 @@ test("toggle(Function, Function)", function() {
});
return false;
}).click().click().click();
-});
\ No newline at end of file
+});