X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=02a7b084c937ab16d1c64e1797eded2a57999777;hb=0cdcef5b364fa3c89d7f27935e77b453f4a56efd;hp=f50a21c1c949fa2e649889e660c7591e1bf4272b;hpb=de659859333c4e1a7840cc8d43765f47fcf53e9f;p=jquery.git diff --git a/test/unit/css.js b/test/unit/css.js index f50a21c..02a7b08 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,9 +1,9 @@ module("css"); test("css(String|Hash)", function() { - expect(28); + expect(29); - equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); + equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"'); ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible'); jQuery('#nothiddendiv').css({display: 'none'}); @@ -19,10 +19,6 @@ test("css(String|Hash)", function() { 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'}); @@ -44,7 +40,12 @@ 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." ); @@ -64,6 +65,7 @@ test("css(String|Hash)", function() { test("css(String, Object)", function() { expect(21); + 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'); @@ -73,10 +75,6 @@ test("css(String, Object)", function() { jQuery("#nothiddendiv").css("top", "-1em"); ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." ); - 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('#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'); @@ -99,6 +97,13 @@ 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." ); }); if(jQuery.browser.msie) { @@ -107,80 +112,137 @@ 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" ); }); } test("css(String, Function)", function() { - try { - expect(3); + expect(3); - var sizes = ["10px", "20px", "30px"]; + var sizes = ["10px", "20px", "30px"]; - jQuery("