X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=f3d314884f952acf7aac4bff3ce90485db650f01;hb=086822e6419c89c33b322bacbbc891148a4b3647;hp=f2e981ec000aee00b67777d237884bdb54fdd308;hpb=1518ae1aedaafa820ed689ecf26cf43e92913896;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index f2e981e..f3d3148 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1238,6 +1238,8 @@ test("live with namespaces", function(){
 });
 
 test("live with change", function(){
+	expect(8);
+
 	var selectChange = 0, checkboxChange = 0;
 	
 	var select = jQuery("select[name='S1']")
@@ -1269,28 +1271,13 @@ test("live with change", function(){
 	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.val(oldTextVal+"foo");
 	text.trigger("change");
 	equals( textChange, 1, "Change on text input." );
 
@@ -1707,6 +1694,8 @@ test("delegate with multiple events", function(){
 });
 
 test("delegate with change", function(){
+	expect(8);
+
 	var selectChange = 0, checkboxChange = 0;
 	
 	var select = jQuery("select[name='S1']");
@@ -1738,28 +1727,13 @@ test("delegate with change", function(){
 	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();
-	jQuery("#body").delegate("#area1", "change", function() {
-		textareaChange++;
-	});
-
-	textarea.val(oldVal + "foo");
-	textarea.trigger("change");
-	equals( textareaChange, 1, "Change on textarea." );
-
-	textarea.val(oldVal);
-	jQuery("#body").undelegate("#area1", "change");
-	
 	// test blur/focus on text
 	var text = jQuery("#name"), textChange = 0, oldTextVal = text.val();
 	jQuery("#body").delegate("#name", "change", function() {
 		textChange++;
 	});
 
-	text.val(oldVal+"foo");
+	text.val(oldTextVal+"foo");
 	text.trigger("change");
 	equals( textChange, 1, "Change on text input." );
 
@@ -1841,7 +1815,27 @@ test("window resize", function() {
 		ok( true, "Resize event fired." );
 	}).resize().unbind("resize");
 
-	ok( !jQuery(window).data("events"), "Make sure all the events are gone." );
+	ok( !jQuery(window).data("__events__"), "Make sure all the events are gone." );
+});
+
+test("focusin bubbles", function() {
+	//create an input and focusin on it
+	var input = jQuery("<input/>"), order = 0;
+
+	input.prependTo("body");
+
+	jQuery("body").bind("focusin.focusinBubblesTest",function(){
+		equals(1,order++,"focusin on the body second")
+	});
+
+	input.bind("focusin.focusinBubblesTest",function(){
+		equals(0,order++,"focusin on the element first")
+	});
+
+	input[0].focus();
+	input.remove();
+
+	jQuery("body").unbind("focusin.focusinBubblesTest");
 });
 
 /*