X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=21167c7de2177beb1673e9f9a86e726caf455a10;hb=dd5c26304af1c5f884ebf0baa5df28a2f8a8c4cc;hp=2937b1c02475f56e3d7de18ed3c262369398300e;hpb=104757705a19df3b6b9750aaef30aa451082f825;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 2937b1c..21167c7 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -72,7 +72,7 @@ test("bind(), multiple events at once and namespaces", function() {
 });
 
 test("bind(), namespace with special add", function() {
-	expect(18);
+	expect(19);
 
 	var div = jQuery("<div/>").bind("test", function(e) {
 		ok( true, "Test event fired." );
@@ -87,7 +87,9 @@ test("bind(), namespace with special add", function() {
 			equals( e.target, div[0], "And that the target is correct." );
 		},
 		setup: function(){},
-		teardown: function(){},
+		teardown: function(){
+			ok(true, "Teardown called.");
+		},
 		add: function( handleObj ) {
 			var handler = handleObj.handler;
 			handleObj.handler = function(e) {
@@ -116,6 +118,8 @@ test("bind(), namespace with special add", function() {
 
 	// Should trigger 2
 	div.trigger("test.b");
+
+	div.unbind("test");
 });
 
 test("bind(), no data", function() {
@@ -755,7 +759,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(65);
+	expect(66);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -772,6 +776,7 @@ test(".live()/.die()", function() {
 	equals( liveb, 0, "Click on body" );
 
 	// This should trigger two events
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendiv").trigger("click");
 	equals( submit, 0, "Click on div" );
 	equals( div, 1, "Click on div" );
@@ -779,55 +784,62 @@ test(".live()/.die()", function() {
 	equals( liveb, 0, "Click on div" );
 
 	// This should trigger three events (w/ bubbling)
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("click");
 	equals( submit, 0, "Click on inner div" );
-	equals( div, 2, "Click on inner div" );
-	equals( livea, 2, "Click on inner div" );
+	equals( div, 1, "Click on inner div" );
+	equals( livea, 1, "Click on inner div" );
 	equals( liveb, 1, "Click on inner div" );
 
 	// This should trigger one submit
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("submit");
 	equals( submit, 1, "Submit on div" );
-	equals( div, 2, "Submit on div" );
-	equals( livea, 2, "Submit on div" );
-	equals( liveb, 1, "Submit on div" );
+	equals( div, 0, "Submit on div" );
+	equals( livea, 0, "Submit on div" );
+	equals( liveb, 0, "Submit on div" );
 
 	// Make sure no other events were removed in the process
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "die Click on inner div" );
-	equals( div, 3, "die Click on inner div" );
-	equals( livea, 3, "die Click on inner div" );
-	equals( liveb, 2, "die Click on inner div" );
+	equals( submit, 0, "die Click on inner div" );
+	equals( div, 1, "die Click on inner div" );
+	equals( livea, 1, "die Click on inner div" );
+	equals( liveb, 1, "die Click on inner div" );
 
 	// Now make sure that the removal works
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "die Click on inner div" );
-	equals( div, 4, "die Click on inner div" );
-	equals( livea, 4, "die Click on inner div" );
-	equals( liveb, 2, "die Click on inner div" );
+	equals( submit, 0, "die Click on inner div" );
+	equals( div, 1, "die Click on inner div" );
+	equals( livea, 1, "die Click on inner div" );
+	equals( liveb, 0, "die Click on inner div" );
 
 	// Make sure that the click wasn't removed too early
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendiv").trigger("click");
-	equals( submit, 1, "die Click on inner div" );
-	equals( div, 5, "die Click on inner div" );
-	equals( livea, 5, "die Click on inner div" );
-	equals( liveb, 2, "die Click on inner div" );
+	equals( submit, 0, "die Click on inner div" );
+	equals( div, 1, "die Click on inner div" );
+	equals( livea, 1, "die Click on inner div" );
+	equals( liveb, 0, "die Click on inner div" );
 
 	// Make sure that stopPropgation doesn't stop live events
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").live("click", function(e){ liveb++; e.stopPropagation(); });
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "stopPropagation Click on inner div" );
-	equals( div, 6, "stopPropagation Click on inner div" );
-	equals( livea, 6, "stopPropagation Click on inner div" );
-	equals( liveb, 3, "stopPropagation Click on inner div" );
+	equals( submit, 0, "stopPropagation Click on inner div" );
+	equals( div, 1, "stopPropagation Click on inner div" );
+	equals( livea, 1, "stopPropagation Click on inner div" );
+	equals( liveb, 1, "stopPropagation Click on inner div" );
 
 	// Make sure click events only fire with primary click
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	var event = jQuery.Event("click");
 	event.button = 1;
 	jQuery("div#nothiddendiv").trigger(event);
 
-	equals( livea, 6, "live secondary click" );
+	equals( livea, 0, "live secondary click" );
 
 	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendiv").die("click");
@@ -1012,6 +1024,14 @@ test(".live()/.die()", function() {
 	equals( livee, 1, "Click, deep selector." );
 
 	jQuery("#nothiddendiv div").die("click");
+
+	jQuery("#nothiddendiv div").live("blur", function(){
+		ok( true, "Live div trigger blur." );
+	});
+
+	jQuery("#nothiddendiv div").trigger("blur");
+
+	jQuery("#nothiddendiv div").die("blur");
 });
 
 test("die all bound events", function(){
@@ -1043,6 +1063,44 @@ test("live with multiple events", function(){
 	equals( count, 2, "Make sure both the click and submit were triggered." );
 });
 
+test("live with namespaces", function(){
+	expect(6);
+
+	var count1 = 0, count2 = 0;
+
+	jQuery("#liveSpan1").live("foo.bar", function(){
+		count1++;
+	});
+
+	jQuery("#liveSpan2").live("foo.zed", function(){
+		count2++;
+	});
+
+	jQuery("#liveSpan1").trigger("foo.bar");
+	equals( count1, 1, "Got live foo.bar" );
+
+	jQuery("#liveSpan2").trigger("foo.zed");
+	equals( count2, 1, "Got live foo.zed" );
+
+	//remove one
+	jQuery("#liveSpan2").die("foo.zed");
+	jQuery("#liveSpan1").trigger("foo.bar");
+
+	equals( count1, 2, "Got live foo.bar after dieing foo.zed" );
+
+	jQuery("#liveSpan2").trigger("foo.zed");
+	equals( count2, 1, "Got live foo.zed" );
+
+	//remove the other
+	jQuery("#liveSpan1").die("foo.bar");
+
+	jQuery("#liveSpan1").trigger("foo.bar");
+	equals( count1, 2, "Did not respond to foo.bar after dieing it" );
+
+	jQuery("#liveSpan2").trigger("foo.zed");
+	equals( count2, 1, "Did not trigger foo.zed again" );
+});
+
 test("live with change", function(){
 	var selectChange = 0, checkboxChange = 0;