diff options
| author | John Resig <jeresig@gmail.com> | 2009-12-09 20:51:58 -0800 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2009-12-09 20:51:58 -0800 |
| commit | 4e9fed3b16ed9612ed373d14a89294e98054f4dd (patch) | |
| tree | c53571147674a626b72e40b15f010e85925d2899 | |
| parent | 6bec6199c255b4fd3fa11b4682d97f2d0658ea4d (diff) | |
| download | jquery-4e9fed3b16ed9612ed373d14a89294e98054f4dd.tar.gz jquery-4e9fed3b16ed9612ed373d14a89294e98054f4dd.zip | |
Made sure that css('width') and height returned string values, not numerical values. Fixes #5627.
| -rw-r--r-- | src/css.js | 4 | ||||
| -rw-r--r-- | test/unit/css.js | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/css.js b/src/css.js index c36b6dcc2..7215fe620 100644 --- a/src/css.js +++ b/src/css.js @@ -18,8 +18,8 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i, jQuery.fn.css = function( name, value ) { return access( this, name, value, true, function( elem, name, value ) { - if (value === undefined) { - return jQuery.css( elem, name ); + if ( value === undefined ) { + return jQuery.curCSS( elem, name ); } if ( typeof value === "number" && !rexclude.test(name) ) { diff --git a/test/unit/css.js b/test/unit/css.js index 76274752e..5e88254d7 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -1,7 +1,7 @@ module("css"); test("css(String|Hash)", function() { - expect(27); + expect(28); equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); @@ -56,6 +56,8 @@ 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')." ); }); test("css(String, Object)", function() { |