deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
John Resig 2009-12-09 20:51:58 -08:00
parent 6bec6199c2
commit 4e9fed3b16
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/css.js
View file

@ -19,7 +19,7 @@ var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
jQuery.fn.css = function( name, value ) { jQuery.fn.css = function( name, value ) {
return access( this, name, value, true, function( elem, name, value ) { return access( this, name, value, true, function( elem, name, value ) {
if ( value === undefined ) { if ( value === undefined ) {
return jQuery.css( elem, name ); return jQuery.curCSS( elem, name );
} }
if ( typeof value === "number" && !rexclude.test(name) ) { if ( typeof value === "number" && !rexclude.test(name) ) {

4
test/unit/css.js
View file

@ -1,7 +1,7 @@
module("css"); module("css");
test("css(String|Hash)", function() { test("css(String|Hash)", function() {
expect(27); expect(28);
equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"'); 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( 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() { test("css(String, Object)", function() {