X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=a71e01b778ce1adcbb108e738c9778c07d476472;hb=34cb5b5812db50d921f7c7a0c398eb68167b3da3;hp=b597a252737e722eda2ae3bcd49b488847035d12;hpb=7cc550727c4e0bcd93c5d435f0799f568fc74dfa;p=jquery.git

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index b597a25..a71e01b 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -3,9 +3,60 @@ module("event");
 test("toggle(Function, Function) - add toggle event and fake a few clicks", function() {
 	expect(1);
 	var count = 0,
-		fn1 = function() { count++; },
-		fn2 = function() { count--; },
+		fn1 = function(e) { count++; },
+		fn2 = function(e) { count--; },
+		preventDefault = function(e) { e.preventDefault() },
 		link = $('#mark');
-	link.click().toggle(fn1, fn2).click().click().click().click().click();
+	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();
 	ok( count == 1, "Check for toggle(fn, fn)" );
+});
+
+test("unbind(event)", function() {
+	expect(4);
+	var el = $("#firstp");
+	el.click(function() {
+		ok( true, "Fake normal bind" );
+	});
+	el.click(function(event) {
+		el.unbind(event);
+		ok( true, "Fake onebind" );
+	});
+	el.click().click();
+	
+	el.click(function() { return; });
+	el.unbind('click');
+	ok( !el[0].onclick, "Handler is removed" ); // Bug #964
+});
+
+test("trigger(event, [data]", function() {
+	expect(3);
+	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" );
+	}
+	$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+});
+
+test("bind() with data", function() {
+	expect(2);
+	var handler = function(event) {
+		ok( event.data, "check passed data exists" );
+		ok( event.data.foo == "bar", "Check value of passed data" );
+	}
+	$("#firstp").bind("click", {foo: "bar"}, handler).click();
+});
+
+test("bind() with data and trigger() with data", function() {
+	expect(4);
+	var handler = function(event, data) {
+		ok( event.data, "check passed data exists" );
+		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"}]);
 });
\ No newline at end of file