library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mike Sherov 2012-08-19 16:03:08 -04:00 committed by Dave Methvin
parent 2b5b4ebbd7
commit 9f86dc922e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/css.js
View File

@ -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" ],

3
test/unit/css.js
View File

@ -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() {