X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fcss.js;h=0e91ae159b6eadedebe6f3310391ccb0e21fecc4;hb=6dfdb14753c66cfd38f8445bd6119ef4a1274d5e;hp=beac04a89e07276e802216dc92c70476fe7d6199;hpb=449e099b97d823ed0252d8821880bc0e471701ea;p=jquery.git diff --git a/test/unit/css.js b/test/unit/css.js index beac04a..0e91ae1 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,7 +1,7 @@ module("css"); test("css(String|Hash)", function() { - expect(27); + expect(29); equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); @@ -12,15 +12,13 @@ test("css(String|Hash)", function() { ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible'); // handle negative numbers by ignoring #1599, #4216 + jQuery('#nothiddendiv').css({ 'width': 1, 'height': 1 }); + 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'}); - equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left'); jQuery('#floatTest').css({'float': 'right'}); equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right'); jQuery('#floatTest').css({'font-size': '30px'}); @@ -42,27 +40,40 @@ test("css(String|Hash)", function() { var div = jQuery('#nothiddendiv'), child = jQuery('#nothiddendivchild'); equals( parseInt(div.css("fontSize")), 16, "Verify fontSize px set." ); + equals( parseInt(div.css("font-size")), 16, "Verify fontSize px set." ); 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." ); + // Have to verify this as the result depends upon the browser's CSS + // support for font-size percentages child.attr("class", "prct"); - equals( parseInt(child.css("fontSize")), 24, "Verify fontSize % set." ); + var prctval = parseInt(child.css("fontSize")), checkval = 0; + if ( prctval === 16 || prctval === 24 ) { + checkval = prctval; + } + + equals( prctval, checkval, "Verify fontSize % set." ); + + equals( typeof child.css("width"), "string", "Make sure that a string width is returned from css('width')." ); }); test("css(String, Object)", function() { - expect(21); + expect(19); 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'); jQuery('#nothiddendiv').css("display", 'block'); ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible'); - jQuery('#floatTest').css('styleFloat', 'left'); - equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left'); - jQuery('#floatTest').css('cssFloat', 'right'); - equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right'); + jQuery("#nothiddendiv").css("top", "-1em"); + ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." ); + jQuery('#floatTest').css('float', 'left'); equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left'); jQuery('#floatTest').css('font-size', '20px'); @@ -76,11 +87,6 @@ test("css(String, Object)", function() { }); jQuery('#foo').css('opacity', ''); equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" ); - // for #1438, IE throws JS error when filter exists but doesn't have opacity in it - 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" ); // using contents will get comments regular, text, and comment nodes var j = jQuery("#nonnodes").contents(); @@ -92,70 +98,140 @@ test("css(String, Object)", function() { equals( jQuery("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" ); }); +if(jQuery.browser.msie) { + test("css(String, Object) for MSIE", function() { + // for #1438, IE throws JS error when filter exists but doesn't have opacity in it + 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 filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) 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" ) + }); +} + test("css(String, Function)", function() { - try { - expect(3); + expect(3); - var sizes = ["10px", "20px", "30px"]; + var sizes = ["10px", "20px", "30px"]; - jQuery("