X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=99bab1fe56e0a02186f1913e3dcef56d87734ed7;hb=8ebb9b22df32fe5739a48087b6e33abb9f5cda49;hp=116312e3fa7819db9778112a832447650916c083;hpb=1ea539b4f08d9056e7e133173f7093908a513f77;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 116312e..99bab1f 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(30);
+	expect(28);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -19,10 +19,6 @@ test("css(String|Hash)", function() {
 	equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored')
 	equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored')
 
-	jQuery('#floatTest').css({styleFloat: 'right'});
-	equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right');
-	jQuery('#floatTest').css({cssFloat: 'left'});
-	equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left');
 	jQuery('#floatTest').css({'float': 'right'});
 	equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');
 	jQuery('#floatTest').css({'font-size': '30px'});
@@ -65,7 +61,7 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(21);
+	expect(19);
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	jQuery('#nothiddendiv').css("display", 'none');
 	ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
@@ -75,10 +71,6 @@ test("css(String, Object)", function() {
 	jQuery("#nothiddendiv").css("top", "-1em");
 	ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." );
 
-	jQuery('#floatTest').css('styleFloat', 'left');
-	equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');
-	jQuery('#floatTest').css('cssFloat', 'right');
-	equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right');
 	jQuery('#floatTest').css('float', 'left');
 	equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left');
 	jQuery('#floatTest').css('font-size', '20px');
@@ -120,69 +112,123 @@ if(jQuery.browser.msie) {
 }
 
 test("css(String, Function)", function() {
-	try { 
-		expect(3);
+	expect(3);
 		
-		var sizes = ["10px", "20px", "30px"];
+	var sizes = ["10px", "20px", "30px"];
 	
-		jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div></div>")
-			.appendTo("body");
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
 	
-		var index = 0;
+	var index = 0;
 	
-		jQuery("#cssFunctionTest div").css("font-size", function() {
-			var size = sizes[index];
-			index++;
-			return size;
-		});
+	jQuery("#cssFunctionTest div").css("font-size", function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	});
 		
-		index = 0;
+	index = 0;
+	
+	jQuery("#cssFunctionTest div").each(function() {
+		var computedSize = jQuery(this).css("font-size")
+		var expectedSize = sizes[index]
+		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
+		index++;
+	});
+
+	jQuery("#cssFunctionTest").remove();
+});
+
+test("css(String, Function) with incoming value", function() {
+	expect(3);
 		
-		jQuery("#cssFunctionTest div").each(function() {
-			var computedSize = jQuery(this).css("font-size")
-			var expectedSize = sizes[index]
-			equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
-			index++;
-		});
+	var sizes = ["10px", "20px", "30px"];
+	
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
+	
+	var index = 0;
+	
+	jQuery("#cssFunctionTest div").css("font-size", function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	});
 		
-	} finally {
-		jQuery("#cssFunctionTest").remove();
-	}
+	index = 0;
+	
+	jQuery("#cssFunctionTest div").css("font-size", function(i, computedSize) {
+		var expectedSize = sizes[index]
+		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
+		index++;
+		return computedSize;
+	});
+
+	jQuery("#cssFunctionTest").remove();
 });
 
 test("css(Object) where values are Functions", function() {
-	try { 
-		expect(3);
+	expect(3);
 		
-		var sizes = ["10px", "20px", "30px"];
+	var sizes = ["10px", "20px", "30px"];
+	
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
+
+	var index = 0;
 	
-		jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div></div>")
-			.appendTo("body");
+	jQuery("#cssFunctionTest div").css({fontSize: function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	}});
+		
+	index = 0;
+		
+	jQuery("#cssFunctionTest div").each(function() {
+		var computedSize = jQuery(this).css("font-size")
+		var expectedSize = sizes[index]
+		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
+		index++;
+	});
+		
+	jQuery("#cssFunctionTest").remove();
+});
+
+test("css(Object) where values are Functions with incoming values", function() {
+	expect(3);
+		
+	var sizes = ["10px", "20px", "30px"];
 	
-		var index = 0;
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
+
+	var index = 0;
 	
-		jQuery("#cssFunctionTest div").css({fontSize: function() {
-			var size = sizes[index];
-			index++;
-			return size;
-		}});
+	jQuery("#cssFunctionTest div").css({fontSize: function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	}});
 		
-		index = 0;
+	index = 0;
 		
-		jQuery("#cssFunctionTest div").each(function() {
-			var computedSize = jQuery(this).css("font-size")
-			var expectedSize = sizes[index]
-			equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
-			index++;
-		});
+	jQuery("#cssFunctionTest div").css({"font-size": function(i, computedSize) {
+		var expectedSize = sizes[index]
+		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
+		index++;
+		return computedSize;
+	}});
 		
-	} finally {
-		jQuery("#cssFunctionTest").remove();
-	}
+	jQuery("#cssFunctionTest").remove();
 });
 
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {