X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=73ce17cb200ef6068e8fafdbc95c90b0ff043492;hb=90b25efa6c3c3676c5ae1dd782d04726e03a31e8;hp=e1a95497d3010f206748a73fa653d42aca1bc5e0;hpb=66fbbec3bb2d0555da55eea4abae0081484d37b4;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index e1a9549..73ce17c 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1,7 +1,7 @@
 module("event");
 
 test("bind()", function() {
-	expect(15);
+	expect(18);
 
 	var handler = function(event) {
 		ok( event.data, "bind() with data, check passed data exists" );
@@ -18,7 +18,20 @@ 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"}]).unbind(handler);
+	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind("click", handler);
+	
+	reset();
+	var clickCounter = mouseoverCounter = 0;
+	var handler = function(event) {
+		if (event.type == "click")
+			clickCounter += 1;
+		else if (event.type == "mouseover")
+			mouseoverCounter += 1;
+	};
+	$("#firstp").bind("click mouseover", handler).trigger("click").trigger("mouseover");
+	ok( clickCounter == 1, "bind() with multiple events at once" );
+	ok( mouseoverCounter == 1, "bind() with multiple events at once" );
+	
 	
 	reset();
 	var handler = function(event) {
@@ -67,6 +80,11 @@ test("bind()", function() {
 
 	// Trigger the remaining fn (1)
 	$("#firstp").trigger("click");
+
+	// 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" );
+	}).trigger("tester");
 });
 
 test("click()", function() {
@@ -91,7 +109,7 @@ test("click()", function() {
 });
 
 test("unbind(event)", function() {
-	expect(6);
+	expect(8);
 	var el = $("#firstp");
 	el.click(function() {
 		ok( true, "Fake normal bind" );
@@ -113,10 +131,22 @@ test("unbind(event)", function() {
 
 	el.unbind('click');
 	ok( !jQuery.data(el[0], "events"), "Removed the events expando after all handlers are unbound." );
+	
+	reset();
+	var clickCounter = mouseoverCounter = 0;
+	var handler = function(event) {
+		if (event.type == "click")
+			clickCounter += 1;
+		else if (event.type == "mouseover")
+			mouseoverCounter += 1;
+	};
+	$("#firstp").bind("click mouseover", handler).unbind("click mouseover", handler).trigger("click").trigger("mouseover");
+	ok( clickCounter == 0, "unbind() with multiple events at once" );
+	ok( mouseoverCounter == 0, "unbind() with multiple events at once" );
 });
 
 test("trigger(event, [data], [fn])", function() {
-	expect(66);
+	expect(67);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -188,6 +218,16 @@ test("trigger(event, [data], [fn])", function() {
 	// Trigger only the handlers (no native) and extra fn, with external event obj
 	// Triggers 9
 	equals( $("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+	
+	var pass = true;
+	try {
+		$('input:first')
+			.hide()
+			.trigger('focus');
+	} catch(e) {
+		pass = false;
+	}
+	ok( pass, "Trigger focus on hidden element" );
 
 	// have the extra handler override the return
 	// Triggers 9