Skip to content

J
jquery
Commit 9f86dc92 authored by Mike Sherov's avatar Mike Sherov Committed by Dave Methvin
Browse files
Options

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

parent 2b5b4ebb
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
src/css.js
View file @ 9f86dc92
...@@ -11,8 +11,7 @@ var curCSS, iframe, iframeDoc, ...@@ -11,8 +11,7 @@ var curCSS, iframe, iframeDoc,
cssShow = { position: "absolute", visibility: "hidden", display: "block" }, cssShow = { position: "absolute", visibility: "hidden", display: "block" },
cssNormalTransform = { cssNormalTransform = {
letterSpacing: 0, letterSpacing: 0,
fontWeight: 400, fontWeight: 400
lineHeight: 1
}, },
cssExpand = [ "Top", "Right", "Bottom", "Left" ], cssExpand = [ "Top", "Right", "Bottom", "Left" ],
......
test/unit/css.js
View file @ 9f86dc92
...@@ -776,11 +776,10 @@ test("css('width') and css('height') should respect box-sizing, see #11004", fun ...@@ -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() { 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("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("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() { test( "cssHooks - expand", function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment