From: Mike Sherov <mike.sherov@gmail.com>
Date: Sun, 19 Aug 2012 20:03:08 +0000 (-0400)
Subject: Fix #12324, line-height "normal" isn't always "1". Close gh-898.
X-Git-Tag: 1.8.1~39
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9f86dc922ed832337d246d7baf8fd397dc837346;p=jquery.git

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

diff --git a/src/css.js b/src/css.js
index d9e7f00d6..3d7565020 100644
--- a/src/css.js
+++ b/src/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" ],
diff --git a/test/unit/css.js b/test/unit/css.js
index dca5a08e0..30ce95fc9 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -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() {