X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=20e55073d9de31bb716b15e1ccd0841d721ccbf3;hb=c0802e5d21548ce5c41e51ff500308d5a5c9b249;hp=af1983cc14b9c4b8bdd6b1bf22edeb516572e390;hpb=4130319e97b1c591d394b73961b6772559cd0549;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index af1983c..20e5507 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(19);
+	expect(23);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -11,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'});
@@ -28,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() {
@@ -71,6 +81,70 @@ 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 = ["#ff0000", "#00ff00", "#0000ff"];
+	
+		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 = ["rgb(255, 0, 0)", "rgb(0, 255, 0)", "rgb(0, 0, 255)"];
+	
+		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() {
+			var computedColor = jQuery(this).css("color").replace(/ /g, '');
+			var expectedColor = colors[index].replace(/ /g, '');
+			equals( computedColor, expectedColor, "Div #" + index + " should be " + expectedColor );
+			index++;
+		});
+		
+	} finally {
+		jQuery("#cssFunctionTest").remove();
+	}
+});
+
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
 	expect(4);