X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=10751ccaaf1c0c2f912bd4079c589f5f258b67ed;hb=49f6f341814dce07b9fe2eff0052feb5ef286dfd;hp=3d401ba7ebe0e7bba5e468524d1a99f5a421238a;hpb=da26d0eb4e7f563da72cf4d5e9a1d99f6719fea4;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 3d401ba..10751cc 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -206,6 +206,45 @@ test("bind/one/unbind(Object)", function(){
 	equals( mouseoverCounter, 4, "bind(Object)" );
 });
 
+test("live/die(Object), delegate/undelegate(String, Object)", function() {
+	expect(6);
+	
+	var clickCounter = 0, mouseoverCounter = 0,
+		$p = jQuery("#firstp"), $a = $p.find("a:first");
+	
+	var events = {
+		click: function( event ) {
+			clickCounter += ( event.data || 1 );
+		},
+		mouseover: function( event ) {
+			mouseoverCounter += ( event.data || 1 );
+		}
+	};
+	
+	function trigger() {
+		$a.trigger("click").trigger("mouseover");
+	}
+	
+	$a.live( events );
+	$p.delegate( "a", events, 2 );
+	
+	trigger();
+	equals( clickCounter, 3, "live/delegate" );
+	equals( mouseoverCounter, 3, "live/delegate" );
+	
+	$p.undelegate( "a", events );
+	
+	trigger();
+	equals( clickCounter, 4, "undelegate" );
+	equals( mouseoverCounter, 4, "undelegate" );
+	
+	$a.die( events );
+	
+	trigger();
+	equals( clickCounter, 4, "die" );
+	equals( mouseoverCounter, 4, "die" );
+});
+
 test("bind(), iframes", function() {
 	// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
 	var doc = jQuery("#loadediframe").contents();
@@ -216,7 +255,7 @@ test("bind(), iframes", function() {
 });
 
 test("bind(), trigger change on select", function() {
-	expect(3);
+	expect(5);
 	var counter = 0;
 	function selectOnChange(event) {
 		equals( event.data, counter++, "Event.data is not a global event object" );
@@ -443,28 +482,28 @@ test("unbind(type)", function() {
 	}
 	
 	message = "unbind passing function";
-	$elem.bind('error', error).unbind('error',error).triggerHandler('error');
+	$elem.bind('error1', error).unbind('error1',error).triggerHandler('error1');
 	
 	message = "unbind all from event";
-	$elem.bind('error', error).unbind('error').triggerHandler('error');
+	$elem.bind('error1', error).unbind('error1').triggerHandler('error1');
 	
 	message = "unbind all";
-	$elem.bind('error', error).unbind().triggerHandler('error');
+	$elem.bind('error1', error).unbind().triggerHandler('error1');
 	
 	message = "unbind many with function";
-	$elem.bind('error error2',error)
-		 .unbind('error error2', error )
-		 .trigger('error').triggerHandler('error2');
+	$elem.bind('error1 error2',error)
+		 .unbind('error1 error2', error )
+		 .trigger('error1').triggerHandler('error2');
 
 	message = "unbind many"; // #3538
-	$elem.bind('error error2',error)
-		 .unbind('error error2')
-		 .trigger('error').triggerHandler('error2');
+	$elem.bind('error1 error2',error)
+		 .unbind('error1 error2')
+		 .trigger('error1').triggerHandler('error2');
 	
 	message = "unbind without a type or handler";
-	$elem.bind("error error2.test",error)
+	$elem.bind("error1 error2.test",error)
 		 .unbind()
-		 .trigger("error").triggerHandler("error2");
+		 .trigger("error1").triggerHandler("error2");
 });
 
 test("unbind(eventObject)", function() {