diff options
| author | Denis Ledoux <dle@odoo.com> | 2016-03-11 11:42:43 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2016-03-11 11:42:43 +0100 |
| commit | 6e09293b7d921a13c014403acd4bdf7d70a03c48 (patch) | |
| tree | ccbdfdbc3eb94b6a2fe2276d21b4b8378ccdb50e /addons/web_editor/static/src/js/transcoder.js | |
| parent | 0eb3170674d0df8b68ff72b3a0c60741531ee7fe (diff) | |
| parent | 8e69043562c125666d63657733428d68e8e97caa (diff) | |
[MERGE] forward port of branch 9.0 up to 8e69043
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 14461ba1cf6..d327252b63d 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(), window.encodeURI(content), window.encodeURI(color)); + var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+Math.max(1, $font.height()), window.encodeURI(content), 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 |