diff options
| author | qdp-odoo <qdp@odoo.com> | 2016-03-16 10:27:19 +0100 |
|---|---|---|
| committer | qdp-odoo <qdp@odoo.com> | 2016-03-16 10:27:19 +0100 |
| commit | 7a3d63b377c730a3052adc960fa2681cd9be37e3 (patch) | |
| tree | 2f9300531b73c484a62f62ba1d85cd6f4e2c9b39 /addons/web_editor/static/src/js/transcoder.js | |
| parent | 9067addbab9dc32002a243f3b48f2e76d23a3373 (diff) | |
| parent | 71d16a369e01515aac988c62371d70549d3b5294 (diff) | |
[MERGE] forward port of branch saas-7 up to revision 71d16a369e01515aac988c62371d70549d3b5294
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 |