X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=fd91819356a45a8470a55a981cf6138658502d8e;hb=4f99e793fa7a745ee49c73193891d6e2a40565c2;hp=a0857a347a30b0a3dbc5435eb14bd657d40b9708;hpb=12bb969411716dcad3237f3403e83744add3f84c;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index a0857a3..fd91819 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -112,6 +112,60 @@ test("bind(), namespaced events, cloned events", function() {
 	ok( jQuery("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" );
 });
 
+test("bind(), multi-namespaced events", function() {
+	expect(6);
+	
+	var order = [
+		"click.test.abc",
+		"click.test.abc",
+		"click.test",
+		"click.test.abc",
+		"click.test",
+		"custom.test2"
+	];
+	
+	function check(name, msg){
+		same(name, order.shift(), msg);
+	}
+
+	jQuery("#firstp").bind("custom.test",function(e){
+		check("custom.test", "Custom event triggered");
+	});
+
+	jQuery("#firstp").bind("custom.test2",function(e){
+		check("custom.test2", "Custom event triggered");
+	});
+
+	jQuery("#firstp").bind("click.test",function(e){
+		check("click.test", "Normal click triggered");
+	});
+
+	jQuery("#firstp").bind("click.test.abc",function(e){
+		check("click.test.abc", "Namespaced click triggered");
+	});
+
+	// Trigger both bound fn (1)
+	jQuery("#firstp").trigger("click.test.abc");
+
+	// Trigger one bound fn (1)
+	jQuery("#firstp").trigger("click.abc");
+
+	// Trigger two bound fn (2)
+	jQuery("#firstp").trigger("click.test");
+
+	// Remove only the one fn
+	jQuery("#firstp").unbind("click.abc");
+
+	// Trigger the remaining fn (1)
+	jQuery("#firstp").trigger("click");
+
+	// Remove the remaining fn
+	jQuery("#firstp").unbind(".test");
+
+	// Trigger the remaining fn (1)
+	jQuery("#firstp").trigger("custom");
+});
+
 test("trigger() shortcuts", function() {
 	expect(6);
 	jQuery('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
@@ -144,6 +198,40 @@ test("trigger() shortcuts", function() {
 	}).load();
 });
 
+test("trigger() bubbling", function() {
+	expect(14);
+
+	var doc = 0, html = 0, body = 0, main = 0, ap = 0;
+
+	jQuery(document).bind("click", function(e){ if ( e.target !== document) { doc++; } });
+	jQuery("html").bind("click", function(e){ html++; });
+	jQuery("body").bind("click", function(e){ body++; });
+	jQuery("#main").bind("click", function(e){ main++; });
+	jQuery("#ap").bind("click", function(){ ap++; return false; });
+
+	jQuery("html").trigger("click");
+	equals( doc, 1, "HTML bubble" );
+	equals( html, 1, "HTML bubble" );
+
+	jQuery("body").trigger("click");
+	equals( doc, 2, "Body bubble" );
+	equals( html, 2, "Body bubble" );
+	equals( body, 1, "Body bubble" );
+
+	jQuery("#main").trigger("click");
+	equals( doc, 3, "Main bubble" );
+	equals( html, 3, "Main bubble" );
+	equals( body, 2, "Main bubble" );
+	equals( main, 1, "Main bubble" );
+
+	jQuery("#ap").trigger("click");
+	equals( doc, 3, "ap bubble" );
+	equals( html, 3, "ap bubble" );
+	equals( body, 2, "ap bubble" );
+	equals( main, 1, "ap bubble" );
+	equals( ap, 1, "ap bubble" );
+});
+
 test("unbind(event)", function() {
 	expect(8);
 	var el = jQuery("#firstp");
@@ -182,7 +270,7 @@ test("unbind(event)", function() {
 });
 
 test("trigger(event, [data], [fn])", function() {
-	expect(67);
+	expect(69);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -213,54 +301,55 @@ test("trigger(event, [data], [fn])", function() {
 		equals( c, "abc", "check passed data" );
 		equals( v, "test", "check current value" );
 	};
+	
+	var $elem = jQuery("#firstp");
 
 	// Simulate a "native" click
-	jQuery("#firstp")[0].click = function(){
+	$elem[0].click = function(){
 		ok( true, "Native call was triggered" );
 	};
 
 	// Triggers handlrs and native
 	// Trigger 5
-	jQuery("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+	$elem.bind("click", handler).trigger("click", [1, "2", "abc"]);
 
 	// Triggers handlers, native, and extra fn
 	// Triggers 9
-	jQuery("#firstp").trigger("click", [1, "2", "abc"], handler4);
+	$elem.trigger("click", [1, "2", "abc"], handler4);
 
 	// Simulate a "native" click
-	jQuery("#firstp")[0].click = function(){
+	$elem[0].click = function(){
 		ok( false, "Native call was triggered" );
 	};
 
-	// Triggers handlers, native, and extra fn
-	// Triggers 7
-	jQuery("#firstp").trigger("click", [1, "2", "abc"], handler2);
-
 	// Trigger only the handlers (no native)
 	// Triggers 5
-	equals( jQuery("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+	equals( $elem.triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
 
 	// Trigger only the handlers (no native) and extra fn
 	// Triggers 8
-	equals( jQuery("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), false, "Verify handler response" );
+	equals( $elem.triggerHandler("click", [1, "2", "abc"], handler2), false, "Verify handler response" );
 
+	var eventObj = jQuery.Event("noNew");
+	
+	ok( eventObj != window, "Instantiate jQuery.Event without the 'new' keyword" );
+	equals( eventObj.type, "noNew", "Verify its type" );
+	
 	// Build fake click event to pass in
-	var eventObj = jQuery.event.fix({ type: "foo", target: document.body });
+	eventObj = new jQuery.Event("click");
 
 	// Trigger only the handlers (no native), with external event obj
 	// Triggers 5
-	equals( jQuery("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
+	equals( $elem.triggerHandler(eventObj, [1, "2", "abc"]), "test", "Verify handler response" );
 
 	// Trigger only the handlers (no native) and extra fn, with external event obj
 	// Triggers 9
-	eventObj = jQuery.event.fix({ type: "foo", target: document.body });
-	equals( jQuery("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+	eventObj = new jQuery.Event("click");
+	equals( $elem.triggerHandler(eventObj, [1, "2", "abc"], handler2), false, "Verify handler response" );
 	
 	var pass = true;
 	try {
-		jQuery('#form input:first')
-			.hide()
-			.trigger('focus');
+		jQuery('#form input:first').hide().trigger('focus');
 	} catch(e) {
 		pass = false;
 	}
@@ -268,11 +357,29 @@ test("trigger(event, [data], [fn])", function() {
 
 	// have the extra handler override the return
 	// Triggers 9
-	equals( jQuery("#firstp").triggerHandler("click", [1, "2", "abc"], handler3), "newVal", "Verify triggerHandler return is overwritten by extra function" );
+	equals( $elem.triggerHandler("click", [1, "2", "abc"], handler3), "newVal", "Verify triggerHandler return is overwritten by extra function" );
 
 	// have the extra handler leave the return value alone
 	// Triggers 9
-	equals( jQuery("#firstp").triggerHandler("click", [1, "2", "abc"], handler4), "test", "Verify triggerHandler return is not overwritten by extra function" );
+	equals( $elem.triggerHandler("click", [1, "2", "abc"], handler4), "test", "Verify triggerHandler return is not overwritten by extra function" );
+	
+	$elem.unbind('click').bind('foo',function(e){
+		equals( e.type, 'foo', 'Verify event type when passed passing an event object' );
+		equals( e.target.id, 'simon1', 'Verify event.target when passed passing an event object' );
+		equals( e.currentTarget.id, 'firstp', 'Verify event.target when passed passing an event object' );
+		equals( e.secret, 'boo!', 'Verify event object\'s custom attribute when passed passing an event object' );
+	});
+	
+	eventObj = new jQuery.Event('foo');
+	eventObj.secret = 'boo!';
+	
+	// Test with event object and bubbling	
+	jQuery("#simon1").trigger( eventObj );
+	
+	// Try passing an object literal
+	jQuery("#simon1").trigger( {type:'foo', secret:'boo!'} );
+	
+	$elem.unbind('foo');
 });
 
 test("toggle(Function, Function, ...)", function() {
@@ -330,6 +437,72 @@ test("toggle(Function, Function, ...)", function() {
 	var data = jQuery.data( $div[0], 'events' );
 	ok( !data, "Unbinding one function from toggle unbinds them all");
 });
+
+test(".live()/.die()", function() {
+	expect(28);
+
+	var submit = 0, div = 0, livea = 0, liveb = 0;
+
+	jQuery("div").live("submit", function(){ submit++; return false; });
+	jQuery("div").live("click", function(){ div++; });
+	jQuery("div#nothiddendiv").live("click", function(){ livea++; });
+	jQuery("div#nothiddendivchild").live("click", function(){ liveb++; });
+
+	// Nothing should trigger on the body
+	jQuery("body").trigger("click");
+	equals( submit, 0, "Click on body" );
+	equals( div, 0, "Click on body" );
+	equals( livea, 0, "Click on body" );
+	equals( liveb, 0, "Click on body" );
+
+	// This should trigger two events
+	jQuery("div#nothiddendiv").trigger("click");
+	equals( submit, 0, "Click on div" );
+	equals( div, 1, "Click on div" );
+	equals( livea, 1, "Click on div" );
+	equals( liveb, 0, "Click on div" );
+
+	// This should trigger three events (w/ bubbling)
+	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( liveb, 1, "Click on inner div" );
+
+	// This should trigger one submit
+	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" );
+
+	// Make sure no other events were removed in the process
+	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" );
+
+	// Now make sure that the removal works
+	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" );
+
+	// Make sure that the click wasn't removed too early
+	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" );
+
+	jQuery("div#nothiddendiv").die("click");
+	jQuery("div").die("click");
+	jQuery("div").die("submit");
+});
+
 /*
 test("jQuery(function($) {})", function() {
 	stop();
@@ -346,4 +519,4 @@ test("event properties", function() {
 		start();
 	}).click();
 });
-*/
\ No newline at end of file
+*/