X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=test%2Funit%2Fcss.js;h=0e91ae159b6eadedebe6f3310391ccb0e21fecc4;hb=6a1d4f1a80e09e3857f25bb6eb7b190a3a9a4de0;hp=f50a21c1c949fa2e649889e660c7591e1bf4272b;hpb=de659859333c4e1a7840cc8d43765f47fcf53e9f;p=jquery.git
diff --git a/test/unit/css.js b/test/unit/css.js
index f50a21c..0e91ae1 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
module("css");
test("css(String|Hash)", function() {
- expect(28);
+ expect(29);
equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
@@ -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." );
@@ -63,7 +64,7 @@ test("css(String|Hash)", function() {
});
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');
@@ -73,10 +74,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');
@@ -118,69 +115,123 @@ if(jQuery.browser.msie) {
}
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;
- 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"];
- jQuery("#cssFunctionTest div").css({fontSize: function() {
- var size = sizes[index];
- index++;
- return size;
- }});
+ jQuery("")
+ .appendTo("body");
+
+ var index = 0;
+
+ 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 () {