X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fcss.js;h=4921391017f3d9f55bebf89042dbe4fc1031a259;hb=8576570e6e5f2ebd95c49a66848f066dcf99d673;hp=116312e3fa7819db9778112a832447650916c083;hpb=1ea539b4f08d9056e7e133173f7093908a513f77;p=jquery.git
diff --git a/test/unit/css.js b/test/unit/css.js
index 116312e..4921391 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,9 +1,9 @@
module("css");
test("css(String|Hash)", function() {
- expect(30);
+ expect(34);
- 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,8 @@ 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');
+ equals( jQuery('
').css('display'), 'none', 'Styles on disconnected nodes');
+
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'});
@@ -48,6 +46,9 @@ test("css(String|Hash)", function() {
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." );
@@ -62,10 +63,31 @@ 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');
ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
@@ -75,10 +97,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');
@@ -95,94 +113,168 @@ test("css(String, Object)", function() {
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
- j.css("padding-left", "1px");
- equals( j.css("padding-left"), "1px", "Check node,textnode,comment css works" );
+ j.css("fontSize", "15px");
+ equals( j.css("fontSize"), "15px", "Check node,textnode,comment css works" );
// 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." );
+
+ // 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) {
+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
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("
")
- .appendTo("body");
+ jQuery("
")
+ .appendTo("body");
- var index = 0;
+ var index = 0;
- jQuery("#cssFunctionTest div").css("font-size", function() {
- var size = sizes[index];
- index++;
- return size;
- });
+ jQuery("#cssFunctionTest div").css("font-size", function() {
+ var size = sizes[index];
+ index++;
+ return size;
+ });
- index = 0;
+ 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(String, Function) with incoming value", function() {
+ expect(3);
- 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++;
- });
+ var sizes = ["10px", "20px", "30px"];
+
+ jQuery("
")
+ .appendTo("body");
+
+ var index = 0;
+
+ jQuery("#cssFunctionTest div").css("font-size", function() {
+ var size = sizes[index];
+ index++;
+ return size;
+ });
- } finally {
- jQuery("#cssFunctionTest").remove();
- }
+ 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();
});
test("css(Object) where values are Functions", function() {
- try {
- expect(3);
+ expect(3);
- var sizes = ["10px", "20px", "30px"];
+ var sizes = ["10px", "20px", "30px"];
- jQuery("
")
- .appendTo("body");
+ jQuery("
")
+ .appendTo("body");
+
+ var index = 0;
+
+ jQuery("#cssFunctionTest div").css({fontSize: function() {
+ var size = sizes[index];
+ 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"];
- var index = 0;
+ jQuery("
")
+ .appendTo("body");
+
+ var index = 0;
- jQuery("#cssFunctionTest div").css({fontSize: function() {
- var size = sizes[index];
- index++;
- return size;
- }});
+ jQuery("#cssFunctionTest div").css({fontSize: function() {
+ var size = sizes[index];
+ index++;
+ return size;
+ }});
- index = 0;
+ 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 div").css({"font-size": function(i, computedSize) {
+ var expectedSize = sizes[index]
+ equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
+ index++;
+ return computedSize;
+ }});
- } finally {
- jQuery("#cssFunctionTest").remove();
- }
+ jQuery("#cssFunctionTest").remove();
});
test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
@@ -196,3 +288,16 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct
ok( !! jQuery(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
ok( ! jQuery(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
});
+
+test(":visible selector works properly on table elements (bug #4512)", function () {
+ expect(1);
+
+ jQuery('#table').html('
cell | cell |
');
+ equals(jQuery('#table td:visible').length, 1, "hidden cell is not perceived as visible");
+});
+
+test(":visible selector works properly on children with a hidden parent (bug #4512)", function () {
+ expect(1);
+ jQuery('#table').css('display', 'none').html('
cell | cell |
');
+ equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible");
+});