X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=26dd7047d437be5af431043cc75a9e45027c0fc0;hb=2ca36598954759c5b5dce569a39c52b981ed4ab2;hp=99bab1fe56e0a02186f1913e3dcef56d87734ed7;hpb=37b607d2815b893d13de4ac3461090d0dd46535e;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 99bab1f..26dd704 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(28);
+	expect(29);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -44,6 +44,9 @@ test("css(String|Hash)", function() {
 	equals( parseInt(child.css("fontSize")), 16, "Verify fontSize px set." );
 	equals( parseInt(child.css("font-size")), 16, "Verify fontSize px set." );
 
+	child.css("height", "100%");
+	equals( child[0].style.height, "100%", "Make sure the height is being set correctly." );
+
 	child.attr("class", "em");
 	equals( parseInt(child.css("fontSize")), 32, "Verify fontSize em set." );
 
@@ -61,7 +64,8 @@ test("css(String|Hash)", function() {
 });
 
 test("css(String, Object)", function() {
-	expect(19);
+	expect(22);
+
 	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');
@@ -93,6 +97,23 @@ test("css(String, Object)", function() {
 	// opera sometimes doesn't update 'display' correctly, see #2037
 	jQuery("#t2037")[0].innerHTML = jQuery("#t2037")[0].innerHTML
 	equals( jQuery("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" );
+
+	var div = jQuery("#nothiddendiv"),
+		display = div.css("display"),
+		ret = div.css("display", undefined);
+
+	equals( ret, div, "Make sure setting undefined returns the original set." );
+	equals( div.css("display"), display, "Make sure that the display wasn't changed." );
+
+	// Test for Bug #5509
+	var success = true;
+	try {
+		jQuery('#foo').css("backgroundColor", "rgba(0, 0, 0, 0.1)");
+	}
+	catch (e) {
+		success = false;
+	}
+	ok( success, "Setting RGBA values does not throw Error" );
 });
 
 if(jQuery.browser.msie) {
@@ -101,13 +122,16 @@ if(jQuery.browser.msie) {
 		jQuery('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
   	equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
 
-    var filterVal = "progid:DXImageTransform.Microsoft.alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
+    var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
     var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
+    var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
     jQuery('#foo').css("filter", filterVal);
     equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
-    jQuery('#foo').css("opacity", 1)
-    equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't clobber other filters" );
-    equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" )
+    jQuery('#foo').css("opacity", 1);
+    equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't duplicate opacity filter" );
+    equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" );
+    jQuery('#foo').css("filter", filterVal3).css("opacity", 1);
+    ok( jQuery('#foo').css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" );
   });
 }