X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=cddd90256ec74d4bc051955d8bb1f41e48395dd1;hb=902cc7947c1c6dd31ff216eea5d0130eb15a33a1;hp=8f24e2e347cb852fd8767cb3072ace1ba2fa3062;hpb=8b129ccd49365582c4013fd391f6f83cc75a5d0a;p=jquery.git
diff --git a/test/unit/css.js b/test/unit/css.js
index 8f24e2e..cddd902 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
module("css");
test("css(String|Hash)", function() {
- expect(42);
+ expect(41);
equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
@@ -13,6 +13,8 @@ test("css(String|Hash)", function() {
var div = jQuery( "
" );
+ // These should be "auto" (or some better value)
+ // temporarily provide "0px" for backwards compat
equals( div.css("width"), "0px", "Width on disconnected node." );
equals( div.css("height"), "0px", "Height on disconnected node." );
@@ -21,13 +23,11 @@ test("css(String|Hash)", function() {
equals( div.css("width"), "4px", "Width on disconnected node." );
equals( div.css("height"), "4px", "Height on disconnected node." );
- var div2 = jQuery( "
").appendTo("body");
+ var div2 = jQuery( "
").appendTo("body");
- equals( div2.find("input").css("width"), "0px", "Width on hidden input." );
- equals( div2.find("input").css("height"), "0px", "Height on hidden input." );
-
- equals( div2.find("textarea").css("width"), "0px", "Width on hidden textarea." );
- equals( div2.find("textarea").css("height"), "0px", "Height on hidden textarea." );
+ equals( div2.find("input").css("height"), "20px", "Height on hidden input." );
+ equals( div2.find("textarea").css("height"), "20px", "Height on hidden textarea." );
+ equals( div2.find("div").css("height"), "20px", "Height on hidden textarea." );
div2.remove();
@@ -158,27 +158,27 @@ test("css(String, Object)", function() {
});
if ( !jQuery.support.opacity ) {
- test("css(String, Object) for MSIE", function() {
- // for #1438, IE throws JS error when filter exists but doesn't have opacity in it
+ 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)";
- 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 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" );
- });
+ 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)";
+ 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 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() {
expect(3);
-
+
var sizes = ["10px", "20px", "30px"];
jQuery("
" +
@@ -193,7 +193,7 @@ test("css(String, Function)", function() {
index++;
return size;
});
-
+
index = 0;
jQuery("#cssFunctionTest div").each(function() {
@@ -208,7 +208,7 @@ test("css(String, Function)", function() {
test("css(String, Function) with incoming value", function() {
expect(3);
-
+
var sizes = ["10px", "20px", "30px"];
jQuery("
" +
@@ -223,7 +223,7 @@ test("css(String, Function) with incoming value", function() {
index++;
return size;
});
-
+
index = 0;
jQuery("#cssFunctionTest div").css("font-size", function(i, computedSize) {
@@ -238,7 +238,7 @@ test("css(String, Function) with incoming value", function() {
test("css(Object) where values are Functions", function() {
expect(3);
-
+
var sizes = ["10px", "20px", "30px"];
jQuery("
" +
@@ -253,22 +253,22 @@ test("css(Object) where values are Functions", function() {
index++;
return size;
}});
-
+
index = 0;
-
+
jQuery("#cssFunctionTest div").each(function() {
var computedSize = jQuery(this).css("font-size")
var expectedSize = sizes[index]
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
index++;
});
-
+
jQuery("#cssFunctionTest").remove();
});
test("css(Object) where values are Functions with incoming values", function() {
expect(3);
-
+
var sizes = ["10px", "20px", "30px"];
jQuery("
" +
@@ -283,16 +283,16 @@ test("css(Object) where values are Functions with incoming values", function() {
index++;
return size;
}});
-
+
index = 0;
-
+
jQuery("#cssFunctionTest div").css({"font-size": function(i, computedSize) {
var expectedSize = sizes[index]
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
index++;
return computedSize;
}});
-
+
jQuery("#cssFunctionTest").remove();
});