X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=0a2914f3d1e3918ef0e6ed66befc282d0a756277;hb=d822c0c2140f8562f0bb7876b48a663ecef60176;hp=ba29ab7ecccd228da2cda7b8e365d6df6ffeb733;hpb=703e89ba302e86bba1f4777ce1a6aee6f38b7b87;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index ba29ab7..0a2914f 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -113,7 +113,7 @@ test("bind(), namespaced events, cloned events", function() {
 });
 
 test("click()", function() {
-	expect(4);
+	expect(5);
 	$('<li><a href="#">Change location</a></li>').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" );
@@ -131,6 +131,13 @@ test("click()", function() {
 	};
 	$('#firstp').click();
 	ok( counter == 1, "Check that click, triggers onclick event handler also" );
+	
+	var clickCounter = 0;
+	$('#simon1')[0].onclick = function(event) {
+		clickCounter++;
+	};
+	$('#simon1').click();
+	ok( clickCounter == 1, "Check that click, triggers onclick event handler on an a tag also" );
 });
 
 test("unbind(event)", function() {
@@ -158,7 +165,7 @@ test("unbind(event)", function() {
 	ok( !jQuery.data(el[0], "events"), "Removed the events expando after all handlers are unbound." );
 	
 	reset();
-	var clickCounter = mouseoverCounter = 0;
+	var clickCounter = (mouseoverCounter = 0);
 	var handler = function(event) {
 		if (event.type == "click")
 			clickCounter += 1;
@@ -264,8 +271,9 @@ test("trigger(event, [data], [fn])", function() {
 	equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler4), "test", "Verify triggerHandler return is not overwritten by extra function" );
 });
 
-test("toggle(Function, Function)", function() {
-	expect(5);
+test("toggle(Function, Function, ...)", function() {
+	expect(11);
+	
 	var count = 0,
 		fn1 = function(e) { count++; },
 		fn2 = function(e) { count--; },
@@ -288,6 +296,35 @@ test("toggle(Function, Function)", function() {
 		});
 		return false;
 	}).click().click().click();
+	
+	var turn = 0;
+	var fns = [
+		function(){
+			turn = 1;
+		},
+		function(){
+			turn = 2;
+		},
+		function(){
+			turn = 3;
+		}
+	];
+	
+	var $div = $("<div>&nbsp;</div>").toggle( fns[0], fns[1], fns[2] );
+	$div.click();
+	ok( turn == 1, "Trying toggle with 3 functions, attempt 1 yields 1");
+	$div.click();
+	ok( turn == 2, "Trying toggle with 3 functions, attempt 2 yields 2");
+	$div.click();
+	ok( turn == 3, "Trying toggle with 3 functions, attempt 3 yields 3");
+	$div.click();
+	ok( turn == 1, "Trying toggle with 3 functions, attempt 4 yields 1");
+	$div.click();
+	ok( turn == 2, "Trying toggle with 3 functions, attempt 5 yields 2");
+	
+	$div.unbind('click',fns[0]);
+	var data = $.data( $div[0], 'events' );
+	ok( !data, "Unbinding one function from toggle unbinds them all");
 });
 
 test("jQuery(function($) {})", function() {
@@ -297,3 +334,11 @@ test("jQuery(function($) {})", function() {
 		start();
 	});
 });
+
+test("event properties", function() {
+	stop();
+	$("#simon1").click(function(event) {
+		ok( event.timeStamp, "assert event.timeStamp is present" );
+		start();
+	}).click();
+});
\ No newline at end of file