X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=beac04a89e07276e802216dc92c70476fe7d6199;hb=04dbdb7525eab7e845100fd17c48889bdb91dc92;hp=a70b11534a29cf021f42fa2b92220c61de63084c;hpb=6a049246a123d7da75430f875e9eee1ba3270722;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index a70b115..beac04a 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(27);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -34,6 +34,21 @@ 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" );
+
+	var div = jQuery('#nothiddendiv'), child = jQuery('#nothiddendivchild');
+
+	equals( parseInt(div.css("fontSize")), 16, "Verify fontSize px set." );
+	equals( parseInt(child.css("fontSize")), 16, "Verify fontSize px set." );
+
+	child.attr("class", "em");
+	equals( parseInt(child.css("fontSize")), 32, "Verify fontSize em set." );
+
+	child.attr("class", "prct");
+	equals( parseInt(child.css("fontSize")), 24, "Verify fontSize % set." );
 });
 
 test("css(String, Object)", function() {
@@ -77,6 +92,72 @@ 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 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;
+		});
+		
+		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++;
+		});
+		
+	} finally {
+		jQuery("#cssFunctionTest").remove();
+	}
+});
+
+test("css(Object) where values are Functions", function() {
+	try { 
+		expect(3);
+		
+		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({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++;
+		});
+		
+	} finally {
+		jQuery("#cssFunctionTest").remove();
+	}
+});
+
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
 	expect(4);