From 4adc5b2217c014ab5afc29705a93e968e127c247 Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Mon, 3 Mar 2014 20:55:30 -0500 Subject: [PATCH] CSS: Return values should be numbers Fixes #14792 (cherry picked from commit f4b37d89820535d6c7503925aa8872645681a865) --- src/css.js | 4 ++-- test/unit/css.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/css.js b/src/css.js index 0f90f0b6a..4b1f91440 100644 --- a/src/css.js +++ b/src/css.js @@ -32,8 +32,8 @@ var cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssNormalTransform = { - letterSpacing: 0, - fontWeight: 400 + letterSpacing: "0", + fontWeight: "400" }, cssPrefixes = [ "Webkit", "O", "Moz", "ms" ]; diff --git a/test/unit/css.js b/test/unit/css.js index 2209f1a40..e084ebf60 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -871,12 +871,13 @@ testIframeWithCallback( "css('width') should work correctly before document read ); test("certain css values of 'normal' should be convertable to a number, see #8627", function() { - expect ( 2 ); + expect ( 3 ); var el = jQuery("
test
").appendTo("#qunit-fixture"); ok( jQuery.isNumeric( parseFloat( el.css("letterSpacing") ) ), "css('letterSpacing') not convertable to number, see #8627" ); ok( jQuery.isNumeric( parseFloat( el.css("fontWeight") ) ), "css('fontWeight') not convertable to number, see #8627" ); + equal( typeof el.css( "fontWeight" ), "string", ".css() returns a string" ); }); // only run this test in IE9