diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-03-24 16:53:45 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-03-24 16:53:45 +0100 |
| commit | ddb0fb273982399f7618a017eeb81d6a5253575a (patch) | |
| tree | f62aea4a3888d45e8bfe0f17baeb4ab9d0b47f41 /addons/web_editor/static/src/js/transcoder.js | |
| parent | d8137d35b7cc30df258fc310074eca3bfd88ec7a (diff) | |
| parent | 59d3f63c58b47dfc1991494f167216cc1d9a9469 (diff) | |
[MERGE] forward port of branch saas-9 up to 59d3f63
Diffstat (limited to 'addons/web_editor/static/src/js/transcoder.js')
| -rw-r--r-- | addons/web_editor/static/src/js/transcoder.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js index 11397063200..89831d35d50 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -133,7 +133,7 @@ var font_to_img = function ($editable) { }); if (content) { var color = $font.css("color").replace(/\s/g, ''); - var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+$font.height(), content.charCodeAt(0), window.encodeURI(color)); + var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+Math.max(1, $font.height()), content.charCodeAt(0), window.encodeURI(color)); var $img = $("<img/>").attr("src", src) .attr("data-class", $font.attr("class")) .attr("class", $font.attr("class").replace(new RegExp("(^|\\s+)" + icon + "(-[^\\s]+)?", "gi"), '')) // remove inline font-awsome style |