Adding in backwards-compatiblity support for jQuery().bind/unbind/trigger - and immed...

[jquery.git] / test / unit / css.js

diff --git a/test/unit/css.js b/test/unit/css.js
index 89f8398..116312e 100644 (file)
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-       expect(23);
+       expect(30);
 
        equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -12,6 +12,8 @@ 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')
@@ -38,6 +40,28 @@ test("css(String|Hash)", function() {
        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" );
+
+       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.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");
+       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() {
@@ -48,6 +72,9 @@ test("css(String, Object)", function() {
        jQuery('#nothiddendiv').css("display", 'block');
        ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
+       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');
@@ -65,11 +92,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();
@@ -81,11 +103,27 @@ 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);
                
-               var colors = ["#ff0000", "#00ff00", "#0000ff"];
+               var sizes = ["10px", "20px", "30px"];
        
                jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
                                         "<div class='cssFunction'></div>" + 
@@ -94,16 +132,18 @@ test("css(String, Function)", function() {
        
                var index = 0;
        
-               jQuery("#cssFunctionTest div").css("color", function() {
-                       var color = colors[index];
+               jQuery("#cssFunctionTest div").css("font-size", function() {
+                       var size = sizes[index];
                        index++;
-                       return color;
+                       return size;
                });
                
                index = 0;
                
                jQuery("#cssFunctionTest div").each(function() {
-                       equals( jQuery(this).css("color"), colors[index], "Div #" + index + " should be " + colors[index] );
+                       var computedSize = jQuery(this).css("font-size")
+                       var expectedSize = sizes[index]
+                       equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
                        index++;
                });
                
@@ -116,7 +156,7 @@ test("css(Object) where values are Functions", function() {
        try { 
                expect(3);
                
-               var colors = ["#ff0000", "#00ff00", "#0000ff"];
+               var sizes = ["10px", "20px", "30px"];
        
                jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
                                         "<div class='cssFunction'></div>" + 
@@ -125,16 +165,18 @@ test("css(Object) where values are Functions", function() {
        
                var index = 0;
        
-               jQuery("#cssFunctionTest div").css({color: function() {
-                       var color = colors[index];
+               jQuery("#cssFunctionTest div").css({fontSize: function() {
+                       var size = sizes[index];
                        index++;
-                       return color;
+                       return size;
                }});
                
                index = 0;
                
                jQuery("#cssFunctionTest div").each(function() {
-                       equals( jQuery(this).css("color"), colors[index], "Div #" + index + " should be " + colors[index] );
+                       var computedSize = jQuery(this).css("font-size")
+                       var expectedSize = sizes[index]
+                       equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
                        index++;
                });