X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=649db5966b57b34526a57a03b4f660d66ed54f93;hb=5e0da8c0365b729f63fbd6d27223776551cb8f46;hp=97e529f00c9885633aa5137482bb76986cb64541;hpb=d7d908b05a442745c1a90728805b74db0a7921cf;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 97e529f..649db59 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,5 +1,7 @@
+module("css");
+
 test("css(String|Hash)", function() {
-	expect(19);
+	expect(23);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -9,6 +11,12 @@ test("css(String|Hash)", function() {
 	jQuery('#nothiddendiv').css({display: 'block'});
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
+	// handle negative numbers by ignoring #1599, #4216
+	var width = parseFloat(jQuery('#nothiddendiv').css('width')), height = parseFloat(jQuery('#nothiddendiv').css('height'));
+	jQuery('#nothiddendiv').css({ width: -1, height: -1 });
+	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'});
@@ -26,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() {
@@ -69,6 +81,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);
 
@@ -79,4 +157,4 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct
 	ok( ! jQuery(":radio:last", $checkedtest).attr("checked"), "Check last radio still NOT checked." );
 	ok( !! jQuery(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
 	ok( ! jQuery(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
-});
\ No newline at end of file
+});