Made sure that css('width') and height returned string values, not numerical values...

diff --git a/src/css.js b/src/css.js
index c36b6dcc25225f777539fd39d81e8652c4768481..7215fe620506884607f852a32c56b8d429f04ceb 100644 (file)
--- 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 76274752e420cf1a1f475b00fd052d855d1bd213..5e88254d78703220bb121d567fc64afa9d267ea6 100644 (file)
--- 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() {