X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=9f84d86e704209fd40e7abd04574184ec3a99a66;hb=e8eff25f3b6d9a0c03f6581089406cebcc86aa34;hp=a70b11534a29cf021f42fa2b92220c61de63084c;hpb=6a049246a123d7da75430f875e9eee1ba3270722;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index a70b115..9f84d86 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(21);
+	expect(23);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -34,6 +34,10 @@ test("css(String|Hash)", function() {
 	});
 	jQuery('#foo').css({opacity: ''});
 	equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" );
+
+	equals( jQuery('#empty').css('opacity'), '0', "Assert opacity is accessible via filter property set in stylesheet in IE" );
+	jQuery('#empty').css({ opacity: '1' });
+	equals( jQuery('#empty').css('opacity'), '1', "Assert opacity is taken from style attribute when set vs stylesheet in IE with filters" );
 });
 
 test("css(String, Object)", function() {
@@ -77,6 +81,68 @@ test("css(String, Object)", function() {
 	equals( jQuery("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" );
 });
 
+test("css(String, Function)", function() {
+	try { 
+		expect(3);
+		
+		var colors = ["red", "green", "blue"];
+	
+		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("color", function() {
+			var color = colors[index];
+			index++;
+			return color;
+		});
+		
+		index = 0;
+		
+		jQuery("#cssFunctionTest div").each(function() {
+			equals( jQuery(this).css("color"), colors[index], "Div #" + index + " should be " + colors[index] );
+			index++;
+		});
+		
+	} finally {
+		jQuery("#cssFunctionTest").remove();
+	}
+});
+
+test("css(Object) where values are Functions", function() {
+	try { 
+		expect(3);
+		
+		var colors = ["red", "green", "blue"];
+	
+		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({color: function() {
+			var color = colors[index];
+			index++;
+			return color;
+		}});
+		
+		index = 0;
+		
+		jQuery("#cssFunctionTest div").each(function() {
+			equals( jQuery(this).css("color"), colors[index], "Div #" + index + " should be " + colors[index] );
+			index++;
+		});
+		
+	} finally {
+		jQuery("#cssFunctionTest").remove();
+	}
+});
+
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
 	expect(4);