X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=a133a104cba3817b33b2a0e13f0c45f1a9d09f23;hb=da5706c974f8ef720b3194179366e1096c19269e;hp=786a46ef1a1d31cc973c76227158ac4b1dcbcb99;hpb=9584e908a2daa2a72bd738302dba7cfd0656dbdf;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 786a46e..a133a10 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");
+	
+	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(Object)" );
+	equals( mouseoverCounter, 3, "live/delegate(Object)" );
+	
+	$p.undelegate( "a", events );
+	
+	trigger();
+	equals( clickCounter, 4, "undelegate(Object)" );
+	equals( mouseoverCounter, 4, "undelegate(Object)" );
+	
+	$a.die( events );
+	
+	trigger();
+	equals( clickCounter, 4, "die(Object)" );
+	equals( mouseoverCounter, 4, "die(Object)" );
+});
+
 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();
@@ -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() {
@@ -978,17 +1017,20 @@ test(".live()/.die()", function() {
 	jQuery("#nothiddendiv").trigger("click");
 	equals( called, 1, "Verify that only one click occurred." );
 
+	called = 0;
 	jQuery("#anchor2").trigger("click");
-	equals( called, 2, "Verify that only one click occurred." );
+	equals( called, 1, "Verify that only one click occurred." );
 
 	// Make sure that only one callback is removed
 	jQuery("#anchor2").die("click", callback);
 
+	called = 0;
 	jQuery("#nothiddendiv").trigger("click");
-	equals( called, 3, "Verify that only one click occurred." );
+	equals( called, 1, "Verify that only one click occurred." );
 
+	called = 0;
 	jQuery("#anchor2").trigger("click");
-	equals( called, 3, "Verify that no click occurred." );
+	equals( called, 0, "Verify that no click occurred." );
 
 	// Make sure that it still works if the selector is the same,
 	// but the event type is different
@@ -997,11 +1039,13 @@ test(".live()/.die()", function() {
 	// Cleanup
 	jQuery("#nothiddendiv").die("click", callback);
 
+	called = 0;
 	jQuery("#nothiddendiv").trigger("click");
-	equals( called, 3, "Verify that no click occurred." );
+	equals( called, 0, "Verify that no click occurred." );
 
+	called = 0;
 	jQuery("#nothiddendiv").trigger("foo");
-	equals( called, 4, "Verify that one foo occurred." );
+	equals( called, 1, "Verify that one foo occurred." );
 
 	// Cleanup
 	jQuery("#nothiddendiv").die("foo", callback);
@@ -1292,21 +1336,64 @@ test("live with submit", function() {
 		ev.preventDefault();
 	});
 
-	if ( jQuery.support.submitBubbles ) {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		equals(count1,1 );
-		equals(count2,1);
-	} else {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
-		equals(count1,2);
-		equals(count2,2);
-	}
+	jQuery("#testForm input[name=sub1]").submit();
+	equals( count1, 1, "Verify form submit." );
+	equals( count2, 1, "Verify body submit." );
 	
 	jQuery("#testForm").die("submit");
 	jQuery("body").die("submit");
 });
 
+test("live with special events", function() {
+	expect(13);
+
+	jQuery.event.special.foo = {
+		setup: function( data, namespaces, handler ) {
+			ok( true, "Setup run." );
+		},
+		teardown: function( namespaces ) {
+			ok( true, "Teardown run." );
+		},
+		add: function( handleObj ) {
+			ok( true, "Add run." );
+		},
+		remove: function( handleObj ) {
+			ok( true, "Remove run." );
+		},
+		_default: function( event ) {
+			ok( true, "Default run." );
+		}
+	};
+
+	// Run: setup, add
+	jQuery("#liveSpan1").live("foo.a", function(e){
+		ok( true, "Handler 1 run." );
+	});
+
+	// Run: add
+	jQuery("#liveSpan1").live("foo.b", function(e){
+		ok( true, "Handler 2 run." );
+	});
+
+	// Run: Handler 1, Handler 2, Default
+	jQuery("#liveSpan1").trigger("foo");
+
+	// Run: Handler 1, Default
+	// TODO: Namespace doesn't trigger default (?)
+	jQuery("#liveSpan1").trigger("foo.a");
+
+	// Run: remove
+	jQuery("#liveSpan1").die("foo.a");
+
+	// Run: Handler 2, Default
+	jQuery("#liveSpan1").trigger("foo");
+
+	// Run: remove, teardown
+	jQuery("#liveSpan1").die("foo");
+
+	delete jQuery.event.special.foo;
+});
+
 test(".delegate()/.undelegate()", function() {
 	expect(65);
 
@@ -1460,17 +1547,20 @@ test(".delegate()/.undelegate()", function() {
 	jQuery("#nothiddendiv").trigger("click");
 	equals( called, 1, "Verify that only one click occurred." );
 
+	called = 0;
 	jQuery("#anchor2").trigger("click");
-	equals( called, 2, "Verify that only one click occurred." );
+	equals( called, 1, "Verify that only one click occurred." );
 
 	// Make sure that only one callback is removed
 	jQuery("#body").undelegate("#anchor2", "click", callback);
 
+	called = 0;
 	jQuery("#nothiddendiv").trigger("click");
-	equals( called, 3, "Verify that only one click occurred." );
+	equals( called, 1, "Verify that only one click occurred." );
 
+	called = 0;
 	jQuery("#anchor2").trigger("click");
-	equals( called, 3, "Verify that no click occurred." );
+	equals( called, 0, "Verify that no click occurred." );
 
 	// Make sure that it still works if the selector is the same,
 	// but the event type is different
@@ -1479,11 +1569,13 @@ test(".delegate()/.undelegate()", function() {
 	// Cleanup
 	jQuery("#body").undelegate("#nothiddendiv", "click", callback);
 
+	called = 0;
 	jQuery("#nothiddendiv").trigger("click");
-	equals( called, 3, "Verify that no click occurred." );
+	equals( called, 0, "Verify that no click occurred." );
 
+	called = 0;
 	jQuery("#nothiddendiv").trigger("foo");
-	equals( called, 4, "Verify that one foo occurred." );
+	equals( called, 1, "Verify that one foo occurred." );
 
 	// Cleanup
 	jQuery("#body").undelegate("#nothiddendiv", "foo", callback);
@@ -1713,16 +1805,9 @@ test("delegate with submit", function() {
 		ev.preventDefault();
 	});
 
-	if ( jQuery.support.submitBubbles ) {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		equals(count1,1 );
-		equals(count2,1);
-	} else {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
-		equals(count1,2);
-		equals(count2,2);
-	}
+	jQuery("#testForm input[name=sub1]").submit();
+	equals( count1, 1, "Verify form submit." );
+	equals( count2, 1, "Verify body submit." );
 	
 	jQuery("#body").undelegate();
 	jQuery(document).undelegate();