Skip to content
Permalink
Browse files

Fix #12324, line-height "normal" isn't always "1". Close gh-898.

  • Loading branch information...
mikesherov authored and dmethvin committed Aug 19, 2012
1 parent 2b5b4eb commit 9f86dc922ed832337d246d7baf8fd397dc837346
Showing with 2 additions and 4 deletions.
  1. +1 −2 src/css.js
  2. +1 −2 test/unit/css.js
@@ -11,8 +11,7 @@ var curCSS, iframe, iframeDoc,
cssShow = { position: "absolute", visibility: "hidden", display: "block" },
cssNormalTransform = {
letterSpacing: 0,
fontWeight: 400,
lineHeight: 1
fontWeight: 400
},

cssExpand = [ "Top", "Right", "Bottom", "Left" ],
@@ -776,11 +776,10 @@ test("css('width') and css('height') should respect box-sizing, see #11004", fun
});

test("certain css values of 'normal' should be convertable to a number, see #8627", function() {
var el = jQuery("<div style='letter-spacing:normal;font-weight:normal;line-height:normal;'>test</div>").appendTo("#qunit-fixture");
var el = jQuery("<div style='letter-spacing:normal;font-weight:normal;'>test</div>").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" );
ok( jQuery.isNumeric( parseFloat( el.css("lineHeight") ) ), "css('lineHeight') not convertable to number, see #8627" );
});

test( "cssHooks - expand", function() {

0 comments on commit 9f86dc9

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.