Merge pull request #23 from vladgolubev/master

Allow set max font size when `sizeToFill: true`

README.md

@@ -19,6 +19,7 @@ CanvasTextWrapper(HTMLCanvasElement, String [, options]);
 | **fitParent**  | *Boolean* | Fit canvas' container size instead of its own size. |
 | **lineBreak**  | `"auto"` `"word"` |  `"auto"` - text goes to the next line on a whole word when there's no room  `"word"` - each next word is placed on a new line |
 | **sizeToFill**  | *Boolean* |  Ignore given font size and line height and resize text to fill its padded container. |
+| **maxFontSizeToFill**  | *Number* |  If above option is `true` text won't be bigger than set. |
 | **strokeText**  | *Boolean* |  Allow text outline based on canvas context configuration. |
 | **justifyLines**  | *Boolean* |  All lines will try to match the same width with flexed spaces between the words. |
 | **allowNewLine**  | *Boolean* |  Text breaks on a new line character "\n". Note it doesn't support multiple new lines, so `"\n\n\n"` will be rendered the same as a single `"\n"`. |
@@ -41,6 +42,7 @@ NOTE: if a single word is too long to fit the width with specified font size, it
         lineBreak: 'auto',
         strokeText: false
         sizeToFill: false,
+        maxFontSizeToFill: false,
         allowNewLine: true,
         justifyLines: false,
         renderHDPI: true,

canvas-text-wrapper.js

@@ -6,6 +6,7 @@
     var defaults = {
       font: '18px Arial, sans-serif',
       sizeToFill: false,
+      maxFontSizeToFill: false,
       lineHeight: 1,
       allowNewLine: true,
       lineBreak: 'auto',
@@ -99,9 +100,18 @@
       if (opts.sizeToFill) {
         var wordsCount = text.trim().split(/\s+/).length;
         var newFontSize = 0;
+        var fontSizeHasLimit = opts.maxFontSizeToFill !== false;
 
         do {
-          adjustFontSize(++newFontSize);
+          if (fontSizeHasLimit) {
+            if (++newFontSize <= opts.maxFontSizeToFill) {
+              adjustFontSize(newFontSize);
+            } else {
+              break;
+            }
+          } else {
+            adjustFontSize(++newFontSize);
+          }
         } while (textBlockHeight < MAX_TXT_HEIGHT && (lines.join(' ').split(/\s+/).length == wordsCount));
 
         adjustFontSize(--newFontSize);