aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit/css.js
diff options
context:
space:
mode:
authorBrandon Aaron <brandon.aaron@gmail.com>2009-04-22 05:23:53 +0000
committerBrandon Aaron <brandon.aaron@gmail.com>2009-04-22 05:23:53 +0000
commit6a049246a123d7da75430f875e9eee1ba3270722 (patch)
tree22af8b76f0a59d6455f0908ec848e792a3565693 /test/unit/css.js
parent8be57929750eac38b0eb331cd99def3d88302cc1 (diff)
downloadjquery-6a049246a123d7da75430f875e9eee1ba3270722.tar.gz
jquery-6a049246a123d7da75430f875e9eee1ba3270722.zip
fix for #4216. css now ignores negative numbers for width and height when passed an object of props and vals.
Diffstat (limited to 'test/unit/css.js')
-rw-r--r--test/unit/css.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/unit/css.js b/test/unit/css.js
index af1983cc1..a70b11534 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
module("css");
test("css(String|Hash)", function() {
- expect(19);
+ expect(21);
equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
@@ -11,6 +11,12 @@ test("css(String|Hash)", function() {
jQuery('#nothiddendiv').css({display: 'block'});
ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
+ // handle negative numbers by ignoring #1599, #4216
+ 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')
+ 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'});