diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-09-23 14:34:26 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-09-23 14:34:26 +0200 |
| commit | 57168a9e90066ed6b3d274d5032a20bef342a00f (patch) | |
| tree | e6af71b6199d1e4bbd808580285242ceb4afde77 /addons/web_editor/static/src/js/transcoder.js | |
| parent | 2bbf3c516df41842302c10326fd6bcd14168a89d (diff) | |
| parent | a669433326430caab705ede8d48eecda16d3ee10 (diff) | |
[MERGE] forward port of branch saas-6 up to a669433
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 716c6f6250d..3b4e31763de 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -107,7 +107,7 @@ var font_to_img = function ($editable) { if (content) { var size = parseInt(parseFloat($font.css("font-size"))/parseFloat($font.parent().css("font-size")),10); var color = $font.css("color").replace(/\s/g, ''); - var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+$font.width(), window.encodeURI(content), window.encodeURI(color)); + var src = _.str.sprintf('/web_editor/font_to_img/%s/%s/'+$font.height(), window.encodeURI(content), window.encodeURI(color)); var style = $font.attr("style"); style = (style ? style.replace(/\s/g, '').replace(/(^|;)height:[^;]*/, '$1').replace(/(^|;)font-size:[^;]*/, '$1') : "") + "height:"+size+"em;"; var $img = $("<img/>").attr("src", src).attr("data-class", $font.attr("class")).attr("style", style); |