X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=cbeb9ff0011c9f59650c4b1c653b4a14bb9094db;hb=d12e8a34e6d96f98ac4f9408a0d61a9ed373f917;hp=e80774fa09d75fd3fc443b00379f8076ccea976e;hpb=4f7441910f664800cca8d252f04ec479518edfe0;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index e80774f..cbeb9ff 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -166,6 +166,72 @@ test("bind(), multi-namespaced events", function() {
 	jQuery("#firstp").trigger("custom");
 });
 
+test("unbind(type)", function() {
+	expect( 0 );
+	
+	var $elem = jQuery("#firstp"),
+		message;
+
+	function error(){
+		ok( false, message );
+	}
+	
+	message = "unbind passing function";
+	$elem.bind('error', error).unbind('error',error).triggerHandler('error');
+	
+	message = "unbind all from event";
+	$elem.bind('error', error).unbind('error').triggerHandler('error');
+	
+	message = "unbind all";
+	$elem.bind('error', error).unbind().triggerHandler('error');
+	
+	message = "unbind many with function";
+	$elem.bind('error error2',error)
+		 .unbind('error error2', error )
+		 .trigger('error').triggerHandler('error2');
+
+	message = "unbind many"; // #3538
+	$elem.bind('error error2',error)
+		 .unbind('error error2')
+		 .trigger('error').triggerHandler('error2');
+});
+
+test("unbind(eventObject)", function() {
+	expect(4);
+	
+	var $elem = jQuery("#firstp"),
+		num;
+
+	function assert( expected ){
+		num = 0;
+		$elem.trigger('foo').triggerHandler('bar');
+		equals( num, expected, "Check the right handlers are triggered" );
+	}
+	
+	$elem
+		// This handler shouldn't be unbound
+		.bind('foo', function(){
+			num += 1;
+		})
+		.bind('foo', function(e){
+			$elem.unbind( e )
+			num += 2;
+		})
+		// Neither this one
+		.bind('bar', function(){
+			num += 4;
+		});
+		
+	assert( 7 );
+	assert( 5 );
+	
+	$elem.unbind('bar');
+	assert( 1 );
+	
+	$elem.unbind();	
+	assert( 0 );
+});
+
 test("trigger() shortcuts", function() {
 	expect(6);
 	jQuery('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
@@ -232,45 +298,8 @@ test("trigger() bubbling", function() {
 	equals( ap, 1, "ap bubble" );
 });
 
-test("unbind(event)", function() {
-	expect(8);
-	var el = jQuery("#firstp");
-	el.click(function() {
-		ok( true, "Fake normal bind" );
-	});
-	el.click(function(event) {
-		el.unbind(event);
-		ok( true, "Fake onebind" );
-	});
-	el.click().click();
-	
-	el.click(function() { return; });
-	el.unbind('click');
-	ok( !el[0].onclick, "Handler is removed" ); // Bug #964
-
-	el.click(function() { return; });
-	el.unbind('change',function(){ return; });
-	for (var ret in jQuery.data(el[0], "events")['click']) break;
-	ok( ret, "Extra handlers weren't accidentally removed." );
-
-	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;
-	};
-	jQuery("#firstp").bind("click mouseover", handler).unbind("click mouseover", handler).trigger("click").trigger("mouseover");
-	equals( clickCounter, 0, "unbind() with multiple events at once" );
-	equals( mouseoverCounter, 0, "unbind() with multiple events at once" );
-});
-
-test("trigger(event, [data], [fn])", function() {
-	expect(69);
+test("trigger(type, [data], [fn])", function() {
+	expect(11);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -280,28 +309,6 @@ test("trigger(event, [data], [fn])", function() {
 		return "test";
 	};
 
-	var handler2 = function(a, b, c) {
-		equals( a, 1, "check passed data" );
-		equals( b, "2", "check passed data" );
-		equals( c, "abc", "check passed data" );
-		return false;
-	};
-
-	var handler3 = function(a, b, c, v) {
-		equals( a, 1, "check passed data" );
-		equals( b, "2", "check passed data" );
-		equals( c, "abc", "check passed data" );
-		equals( v, "test", "check current value" );
-		return "newVal";
-	};
-
-	var handler4 = function(a, b, c, v) {
-		equals( a, 1, "check passed data" );
-		equals( b, "2", "check passed data" );
-		equals( c, "abc", "check passed data" );
-		equals( v, "test", "check current value" );
-	};
-	
 	var $elem = jQuery("#firstp");
 
 	// Simulate a "native" click
@@ -313,10 +320,6 @@ test("trigger(event, [data], [fn])", function() {
 	// Trigger 5
 	$elem.bind("click", handler).trigger("click", [1, "2", "abc"]);
 
-	// Triggers handlers, native, and extra fn
-	// Triggers 9
-	$elem.trigger("click", [1, "2", "abc"], handler4);
-
 	// Simulate a "native" click
 	$elem[0].click = function(){
 		ok( false, "Native call was triggered" );
@@ -326,27 +329,6 @@ test("trigger(event, [data], [fn])", function() {
 	// Triggers 5
 	equals( $elem.triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
 
-	// Trigger only the handlers (no native) and extra fn
-	// Triggers 8
-	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
-	eventObj = new jQuery.Event("click");
-
-	// Trigger only the handlers (no native), with external event obj
-	// Triggers 5
-	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 = 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');
@@ -354,32 +336,85 @@ test("trigger(event, [data], [fn])", function() {
 		pass = false;
 	}
 	ok( pass, "Trigger focus on hidden element" );
+});
 
-	// have the extra handler override the return
-	// Triggers 9
-	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( $elem.triggerHandler("click", [1, "2", "abc"], handler4), "test", "Verify triggerHandler return is not overwritten by extra function" );
+test("trigger(eventObject, [data], [fn])", function() {
+	expect(25);
+	
+	var $parent = jQuery('<div id="par" />').hide().appendTo('body'),
+		$child = jQuery('<p id="child">foo</p>').appendTo( $parent );
+	
+	var event = jQuery.Event("noNew");	
+	ok( event != window, "Instantiate jQuery.Event without the 'new' keyword" );
+	equals( event.type, "noNew", "Verify its type" );
+	
+	equals( event.isDefaultPrevented(), false, "Verify isDefaultPrevented" );
+	equals( event.isPropagationStopped(), false, "Verify isPropagationStopped" );
+	equals( event.isImmediatePropagationStopped(), false, "Verify isImmediatePropagationStopped" );
 	
-	$elem.unbind('click').bind('foo',function(e){
+	event.preventDefault();
+	equals( event.isDefaultPrevented(), true, "Verify isDefaultPrevented" );
+	event.stopPropagation();
+	equals( event.isPropagationStopped(), true, "Verify isPropagationStopped" );
+	
+	event.isPropagationStopped = function(){ return false };
+	event.stopImmediatePropagation();
+	equals( event.isPropagationStopped(), true, "Verify isPropagationStopped" );
+	equals( event.isImmediatePropagationStopped(), true, "Verify isPropagationStopped" );
+	
+	$parent.bind('foo',function(e){
+		// Tries bubbling
 		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.target.id, 'child', 'Verify event.target when passed passing an event object' );
+		equals( e.currentTarget.id, 'par', '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 an event object
+	event = new jQuery.Event("foo");
+	event.secret = 'boo!';
+	$child.trigger(event);
+	
+	// test with a literal object
+	$child.trigger({type:'foo', secret:'boo!'});
+	
+	$parent.unbind();
+
+	function error(){
+		ok( false, "This assertion shouldn't be reached");
+	}
+	
+	$parent.bind('foo', error );
+	
+	$child.bind('foo',function(e, a, b, c ){
+		equals( arguments.length, 4, "Check arguments length");
+		equals( a, 1, "Check first custom argument");
+		equals( b, 2, "Check second custom argument");
+		equals( c, 3, "Check third custom argument");
+		
+		equals( e.isDefaultPrevented(), false, "Verify isDefaultPrevented" );
+		equals( e.isPropagationStopped(), false, "Verify isPropagationStopped" );
+		equals( e.isImmediatePropagationStopped(), false, "Verify isImmediatePropagationStopped" );
+		
+		// Skips both errors
+		e.stopImmediatePropagation();
+		
+		return "result";
+	});
+	
+	// We should add this back in when we want to test the order
+	// in which event handlers are iterated.
+	//$child.bind('foo', error );
 	
-	// Test with event object and bubbling	
-	jQuery("#simon1").trigger( eventObj );
+	event = new jQuery.Event("foo");
+	$child.trigger( event, [1,2,3] ).unbind();
+	equals( event.result, "result", "Check event.result attribute");
 	
-	// Try passing an object literal
-	jQuery("#simon1").trigger( {type:'foo', secret:'boo!'} );
+	// Will error if it bubbles
+	$child.triggerHandler('foo');
 	
-	$elem.unbind('foo');
+	$child.unbind();
+	$parent.unbind().remove();
 });
 
 test("toggle(Function, Function, ...)", function() {
@@ -439,7 +474,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(30);
+	expect(34);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -515,6 +550,31 @@ test(".live()/.die()", function() {
 	jQuery("#anchor2").trigger("click");
 	equals( window.location.hash, hash, "e.preventDefault() worked" );
 	jQuery("#anchor2").die("click");
+
+	// Test binding the same handler to multiple points
+	var called = 0;
+	function callback(){ called++; return false; }
+
+	jQuery("#nothiddendiv").live("click", callback);
+	jQuery("#anchor2").live("click", callback);
+
+	jQuery("#nothiddendiv").trigger("click");
+	equals( called, 1, "Verify that only one click occurred." );
+
+	jQuery("#anchor2").trigger("click");
+	equals( called, 2, "Verify that only one click occurred." );
+
+	// Make sure that only one callback is removed
+	jQuery("#anchor2").die("click", callback);
+
+	jQuery("#nothiddendiv").trigger("click");
+	equals( called, 3, "Verify that only one click occurred." );
+
+	jQuery("#anchor2").trigger("click");
+	equals( called, 3, "Verify that only one click occurred." );
+
+	// Cleanup
+	jQuery("#nothiddendiv").die("click", callback);
 });
 
 /*