X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=8a4909689dc2de86439a96a7713c732631e5ac02;hp=02a7b084c937ab16d1c64e1797eded2a57999777;hb=b0dcc1746f58f5aca17a12794dd928c0deaaa6a0;hpb=543db64412b37b5fa1f3d7fea19f62d6db993fb0 diff --git a/test/unit/css.js b/test/unit/css.js index 02a7b08..8a49096 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,7 +1,7 @@ module("css"); test("css(String|Hash)", function() { - expect(29); + expect(33); equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"'); @@ -61,10 +61,30 @@ test("css(String|Hash)", function() { equals( prctval, checkval, "Verify fontSize % set." ); equals( typeof child.css("width"), "string", "Make sure that a string width is returned from css('width')." ); + + var old = child[0].style.height; + + // Test NaN + child.css("height", parseFloat("zoo")); + equals( child[0].style.height, old, "Make sure height isn't changed on NaN." ); + + // Test null + child.css("height", null); + equals( child[0].style.height, old, "Make sure height isn't changed on null." ); + + old = child[0].style.fontSize; + + // Test NaN + child.css("font-size", parseFloat("zoo")); + equals( child[0].style.fontSize, old, "Make sure font-size isn't changed on NaN." ); + + // Test null + child.css("font-size", null); + equals( child[0].style.fontSize, old, "Make sure font-size isn't changed on null." ); }); test("css(String, Object)", function() { - expect(21); + expect(22); ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible'); jQuery('#nothiddendiv').css("display", 'none'); @@ -104,6 +124,16 @@ test("css(String, Object)", function() { 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) {