use original line-height instead of original font-size for line-heigh…

…t preservation
patrickmarabeas · Jun 21, 2015 · b73d429 · b73d429
1 parent 44d0cd4
commit b73d429
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/demo/styles/main.css b/demo/styles/main.css
@@ -121,7 +121,8 @@ body {
     font-size: 50px;
     text-align: center;
     margin-top: 10px;
-    margin-bottom: 10px; }
+    margin-bottom: 10px;
+    line-height: 1.5; }
   #plh-container p {
     text-transform: uppercase; }
 

diff --git a/demo/styles/main.scss b/demo/styles/main.scss
@@ -174,6 +174,7 @@ body {
     text-align: center;
     margin-top: 10px;
     margin-bottom: 10px;
+    line-height: 1.5;
   }
 
   p {

diff --git a/src/ng-FitText.js b/src/ng-FitText.js
@@ -40,7 +40,7 @@
           var minFontSize = attrs.fittextMin || config.min || Number.NEGATIVE_INFINITY;
           var maxFontSize = attrs.fittextMax || config.max || Number.POSITIVE_INFINITY;
           var preserveLineHeight = attrs.fittextPreserveLineHeight !== undefined ? attrs.fittextPreserveLineHeight : config.preserveLineHeight;
-          var originalFontSize = window.getComputedStyle(element[0],null).getPropertyValue('font-size');
+          var originalLineHeight = window.getComputedStyle(element[0],null).getPropertyValue('line-height');
 
           var resizer = function() {
             element[0].style.lineHeight = '1';
@@ -53,7 +53,7 @@
               parseFloat(minFontSize)
             ) + 'px';
             if ( preserveLineHeight !== undefined ) {
-              element[0].style.lineHeight = originalFontSize;
+              element[0].style.lineHeight = originalLineHeight;
             }
           };