X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=99ed419363db1ef58577075a5129b0fb51a9a10a;hb=3e286440d55749382a644ea97b4f0b2587779d65;hp=e2ed0e3db99cb9def57952fbd9db847e9e9fc532;hpb=6e5a6a26a7d802b3abdc32d3b49f4936d1f63cd7;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index e2ed0e3..99ed419 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -232,8 +232,8 @@ test("bind(), with different this object", function() {
 		};
 	
 	jQuery("#firstp")
-		.bind("click", handler1, thisObject).click().unbind("click", handler1)
-		.bind("click", data, handler2, thisObject).click().unbind("click", handler2);
+		.bind("click", jQuery.proxy(handler1, thisObject)).click().unbind("click", handler1)
+		.bind("click", data, jQuery.proxy(handler2, thisObject)).click().unbind("click", handler2);
 
 	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
 });
@@ -608,7 +608,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(58);
+	expect(62);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -675,6 +675,13 @@ test(".live()/.die()", function() {
 	equals( livea, 6, "stopPropagation Click on inner div" );
 	equals( liveb, 3, "stopPropagation Click on inner div" );
 
+	// Make sure click events only fire with primary click
+	var event = jQuery.Event("click");
+	event.button = 1;
+	jQuery("div#nothiddendiv").trigger(event);
+
+	equals( livea, 6, "live secondary click" );
+
 	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendiv").die("click");
 	jQuery("div").die("click");
@@ -706,15 +713,15 @@ test(".live()/.die()", function() {
 	jQuery("#foo").trigger("click", true).die("click");
 
 	// Test binding with different this object
-	jQuery("#foo").live("click", function(e){ equals( this.foo, "bar", "live with event scope" ); }, { foo: "bar" });
+	jQuery("#foo").live("click", jQuery.proxy(function(e){ equals( this.foo, "bar", "live with event scope" ); }, { foo: "bar" }));
 	jQuery("#foo").trigger("click").die("click");
 
 	// Test binding with different this object, event data, and trigger data
-	jQuery("#foo").live("click", true, function(e, data){
+	jQuery("#foo").live("click", true, jQuery.proxy(function(e, data){
 		equals( e.data, true, "live with with different this object, event data, and trigger data" );
 		equals( this.foo, "bar", "live with with different this object, event data, and trigger data" ); 
 		equals( data, true, "live with with different this object, event data, and trigger data")
-	}, { foo: "bar" });
+	}, { foo: "bar" }));
 	jQuery("#foo").trigger("click", true).die("click");
 
 	// Verify that return false prevents default action
@@ -796,8 +803,8 @@ test(".live()/.die()", function() {
 	equals( livee, 0, "Verify that second handler doesn'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').live('click', function(){ livee++; });
+	jQuery('span#liveSpan2 a').live('click', function(){ lived++; return false; });
 
 	lived = 0;
 	livee = 0;
@@ -818,22 +825,193 @@ test(".live()/.die()", function() {
 	jQuery('span#liveSpan1 a').click();
 	
 	jQuery('span#liveSpan1').die('click');
+
+	// Work with deep selectors
+	livee = 0;
+
+	function clickB(){ livee++; }
+
+	jQuery("#nothiddendiv div").live("click", function(){ livee++; });
+	jQuery("#nothiddendiv div").live("click", clickB);
+	jQuery("#nothiddendiv div").live("mouseover", function(){ livee++; });
+
+	equals( livee, 0, "No clicks, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 2, "Click, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("mouseover");
+	equals( livee, 1, "Mouseover, deep selector." );
+
+	jQuery("#nothiddendiv div").die("mouseover");
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 2, "Click, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("mouseover");
+	equals( livee, 0, "Mouseover, deep selector." );
+
+	jQuery("#nothiddendiv div").die("click", clickB);
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 1, "Click, deep selector." );
+
+	jQuery("#nothiddendiv div").die("click");
 });
 
-test("live with submit", function() {
+test("die all bound events", function(){
+	expect(1);
+
 	var count = 0;
+	var div = jQuery("div#nothiddendivchild");
+
+	div.live("click submit", function(){ count++; });
+	div.die();
+
+	div.trigger("click");
+	div.trigger("submit");
+
+	equals( count, 0, "Make sure no events were triggered." );
+});
+
+test("live with multiple events", function(){
+	expect(1);
+
+	var count = 0;
+	var div = jQuery("div#nothiddendivchild");
+
+	div.live("click submit", function(){ count++; });
+
+	div.trigger("click");
+	div.trigger("submit");
+
+	equals( count, 2, "Make sure both the click and submit were triggered." );
+});
+
+test("live with change", function(){
+	var selectChange = 0, checkboxChange = 0;
 	
-	jQuery("#testForm").live("submit", function() {
-		count++;
-		return false;
+	var select = jQuery("select[name='S1']")
+	select.live("change", function() {
+		selectChange++;
 	});
 	
-	jQuery("#testForm input[name=sub1]")[0].click();
-	jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
+	var checkbox = jQuery("#check2"), 
+		checkboxFunction = function(){
+			checkboxChange++;
+		}
+	checkbox.live("change", checkboxFunction);
+	
+	// test click on select
+
+	// second click that changed it
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 1, "Change on click." );
+	
+	// test keys on select
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 1, "Change on keyup." );
+	
+	// test click on checkbox
+	checkbox.trigger("change");
+	equals( checkboxChange, 1, "Change on checkbox." );
+	
+	// test before activate on radio
+	
+	// test blur/focus on textarea
+	var textarea = jQuery("#area1"), textareaChange = 0, oldVal = textarea.val();
+	textarea.live("change", function() {
+		textareaChange++;
+	});
+
+	textarea.val(oldVal + "foo");
+	textarea.trigger("change");
+	equals( textareaChange, 1, "Change on textarea." );
+
+	textarea.val(oldVal);
+	textarea.die("change");
+	
+	// test blur/focus on text
+	var text = jQuery("#name"), textChange = 0, oldTextVal = text.val();
+	text.live("change", function() {
+		textChange++;
+	});
+
+	text.val(oldVal+"foo");
+	text.trigger("change");
+	equals( textChange, 1, "Change on text input." );
+
+	text.val(oldTextVal);
+	text.die("change");
 	
-	equals(2, count);
+	// test blur/focus on password
+	var password = jQuery("#name"), passwordChange = 0, oldPasswordVal = password.val();
+	password.live("change", function() {
+		passwordChange++;
+	});
+
+	password.val(oldPasswordVal + "foo");
+	password.trigger("change");
+	equals( passwordChange, 1, "Change on password input." );
+
+	password.val(oldPasswordVal);
+	password.die("change");
+	
+	// make sure die works
+	
+	// die all changes
+	selectChange = 0;
+	select.die("change");
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 0, "Die on click works." );
+
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 0, "Die on keyup works." );
+	
+	// die specific checkbox
+	checkbox.die("change", checkboxFunction);
+	checkbox.trigger("change");
+	equals( checkboxChange, 1, "Die on checkbox." );
+});
+
+test("live with submit", function() {
+	var count1 = 0, count2 = 0;
+	
+	jQuery("#testForm").live("submit", function(ev) {
+		count1++;
+		ev.preventDefault();
+	});
+
+	jQuery("body").live("submit", function(ev) {
+		count2++;
+		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").die("submit");
+	jQuery("body").die("submit");
 });
 
 test("live with focus/blur", function(){