summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js/transcoder.js
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2015-09-28 10:44:12 +0200
committerChristophe Matthieu <chm@odoo.com>2015-09-28 15:23:35 +0200
commitbdf58adb465b2016d0d288cdcdec592e4151061d (patch)
treed5e2924c409da80f9b6b783a9a6c181d718418ae /addons/web_editor/static/src/js/transcoder.js
parent6ebcc061523b60bb81aa837f93ce2f2a03f6d37f (diff)
[FIX] web_editor: send mail to outlook and keep image size
Office Outlook doesn't take into account the [style] attribute, and it doesn't manage width/height in percent value. This commit set width/heigth attribute in pixels and also always set the width/height in style attribute (keeping them in the original unit and setting them to auto if not present).
Diffstat (limited to 'addons/web_editor/static/src/js/transcoder.js')
-rw-r--r--addons/web_editor/static/src/js/transcoder.js15
1 files changed, 10 insertions, 5 deletions
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js
index 3b4e31763de..583dcf9a8d6 100644
--- a/addons/web_editor/static/src/js/transcoder.js
+++ b/addons/web_editor/static/src/js/transcoder.js
@@ -105,12 +105,14 @@ 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.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);
+ var $img = $("<img/>").attr("src", src)
+ .attr("data-class", $font.attr("class"))
+ .attr("style", $font.attr("style"))
+ .attr("height", $font.height())
+ .css("height", "")
+ .css("font-size", "");
$font.replaceWith($img);
} else {
$font.remove();
@@ -121,7 +123,10 @@ var font_to_img = function ($editable) {
var img_to_font = function ($editable) {
$("img[src*='/web_editor/font_to_img/']", $editable).each(function () {
var $img = $(this);
- var $font = $("<span/>").attr("class", $img.data("class")).attr("style", $img.attr("style")).css("height", "");
+ var $font = $("<span/>")
+ .attr("class", $img.data("class"))
+ .attr("style", $img.attr("style"))
+ .css("height", "");
$img.replaceWith($font);
});
};