X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=68c54cb193382b6d2c0a3fbde2bf98efec4af3f8;hb=ab756ceab04d13706593ddcd0fda1ac8360ff773;hp=da6dd792ccc7c34690f24af04d3fd238231e35b3;hpb=2fa855601e9ece6c0a240202b0534702b7e5c153;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index da6dd79..68c54cb 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -72,6 +72,10 @@ test("bind(), trigger change on select", function() {
 test("bind(), namespaced events, cloned events", function() {
 	expect(6);
 
+	$("#firstp").bind("custom.test",function(e){
+		ok(true, "Custom event triggered");
+	});
+
 	$("#firstp").bind("click",function(e){
 		ok(true, "Normal click triggered");
 	});
@@ -92,6 +96,12 @@ test("bind(), namespaced events, cloned events", function() {
 	// Trigger the remaining fn (1)
 	$("#firstp").trigger("click");
 
+	// Remove the remaining fn
+	$("#firstp").unbind(".test");
+
+	// Trigger the remaining fn (0)
+	$("#firstp").trigger("custom");
+
 	// using contents will get comments regular, text, and comment nodes
 	$("#nonnodes").contents().bind("tester", function () {
 		equals(this.nodeType, 1, "Check node,textnode,comment bind just does real nodes" );
@@ -103,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" );
@@ -121,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() {
@@ -148,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;
@@ -287,3 +304,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