X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=840c98a5c3e39bff55a9ceddf6526d32661d1bba;hb=0a1b0db347119a2e45d3d31285223ead27b64506;hp=98cc734aaffc241f749f4ba16f8cdcdcf48299ee;hpb=c0446c70d52fe2afd74b2f95c384ae238c48ad09;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 98cc734..840c98a 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(type, [data], [fn])", function() {
-	expect(46);
+	expect(11);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -280,28 +309,6 @@ test("trigger(type, [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(type, [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,9 +329,6 @@ test("trigger(type, [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 pass = true;
 	try {
 		jQuery('#form input:first').hide().trigger('focus');
@@ -336,14 +336,6 @@ test("trigger(type, [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() {
@@ -410,7 +402,9 @@ test("trigger(eventObject, [data], [fn])", function() {
 		return "result";
 	});
 	
-	$child.bind('foo', error );
+	// We should add this back in when we want to test the order
+	// in which event handlers are iterated.
+	//$child.bind('foo', error );
 	
 	event = new jQuery.Event("foo");
 	$child.trigger( event, [1,2,3] ).unbind();
@@ -423,6 +417,20 @@ test("trigger(eventObject, [data], [fn])", function() {
 	$parent.unbind().remove();
 });
 
+test("jQuery.Event.currentTarget", function(){
+	expect(2);
+	
+	var counter = 0,
+		$elem = jQuery('<button>a</button>').click(function(e){
+		equals( e.currentTarget, this, "Check currentTarget on "+(counter++?"native":"fake") +" event" );
+	});
+	
+	// Fake event
+	$elem.trigger('click');
+	// Native event (#4033)
+	triggerEvent( $elem[0], 'click' );
+});
+
 test("toggle(Function, Function, ...)", function() {
 	expect(11);
 	
@@ -480,7 +488,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(30);
+	expect(46);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -539,6 +547,15 @@ test(".live()/.die()", function() {
 	equals( livea, 5, "die Click on inner div" );
 	equals( liveb, 2, "die Click on inner div" );
 
+	// Make sure that stopPropgation doesn't stop live events
+	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" );
+
+	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendiv").die("click");
 	jQuery("div").die("click");
 	jQuery("div").die("submit");
@@ -556,6 +573,81 @@ 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 no click occurred." );
+
+	// Make sure that it still works if the selector is the same,
+	// but the event type is different
+	jQuery("#nothiddendiv").live("foo", callback);
+
+	// Cleanup
+	jQuery("#nothiddendiv").die("click", callback);
+
+	jQuery("#nothiddendiv").trigger("click");
+	equals( called, 3, "Verify that no click occurred." );
+
+	jQuery("#nothiddendiv").trigger("foo");
+	equals( called, 4, "Verify that one foo occurred." );
+
+	// Cleanup
+	jQuery("#nothiddendiv").die("foo", callback);
+	
+	// Make sure we don't loose the target by DOM modifications
+	// after the bubble already reached the liveHandler
+	var livec = 0, elemDiv = jQuery("#nothiddendivchild").html('<span></span>').get(0);
+	
+	jQuery("#nothiddendivchild").live("click", function(e){ jQuery("#nothiddendivchild").html(''); });
+	jQuery("#nothiddendivchild").live("click", function(e){ if(e.target) {livec++;} });
+	
+	jQuery("#nothiddendiv span").click();
+	equals( jQuery("#nothiddendiv span").length, 0, "Verify that first handler occurred and modified the DOM." );
+	equals( livec, 1, "Verify that second handler occurred even with nuked target." );
+	
+	// Cleanup
+	jQuery("#nothiddendivchild").die("click");
+
+	// Verify that .live() ocurs and cancel buble in the same order as
+	// we would expect .bind() and .click() without delegation
+	var lived = 0, livee = 0;
+	
+	// bind one pair in one order
+	jQuery('span#liveSpan1 a').live('click', function(){ lived++; return false; });
+	jQuery('span#liveSpan1').live('click', function(){	livee++; });
+
+	jQuery('span#liveSpan1 a').click();
+	equals( lived, 1, "Verify that only one first handler occurred." );
+	equals( livee, 0, "Verify that second handler don't." );
+
+	// and one pair in inverse
+	jQuery('#liveHandlerOrder span#liveSpan2').live('click', function(){	livee++; });
+	jQuery('#liveHandlerOrder span#liveSpan2 a').live('click', function(){ lived++; return false; });
+
+	jQuery('span#liveSpan2 a').click();
+	equals( lived, 2, "Verify that only one first handler occurred." );
+	equals( livee, 0, "Verify that second handler don't." );
+	
+	// Cleanup
+	jQuery("span#liveSpan1 a, span#liveSpan1, span#liveSpan2 a, span#liveSpan2").die("click");
 });
 
 /*