From f83f5322373de97bd9fb3b4c6738e297cadaafa7 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 4 Jul 2018 13:31:43 +0200 Subject: [PATCH] [FIX] web_editor: send an image thumbnail for attachment link in mail Before this fix attachmentThumbnailToLinkImg is not called for style-inline options. The mail received does not have thumbnail and the user can't click on the invisible link. opw-1863659 --- addons/web_editor/static/src/js/backend/fields.js | 6 ++++-- addons/web_editor/static/src/js/inline.js | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/web_editor/static/src/js/backend/fields.js b/addons/web_editor/static/src/js/backend/fields.js index aae767ba931..8bcb3d034ec 100644 --- a/addons/web_editor/static/src/js/backend/fields.js +++ b/addons/web_editor/static/src/js/backend/fields.js @@ -172,9 +172,9 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi */ _getValue: function () { if (this.nodeOptions['style-inline']) { - transcoder.linkImgToAttachmentThumbnail(this.$content); - transcoder.classToStyle(this.$content); + transcoder.attachmentThumbnailToLinkImg(this.$content); transcoder.fontToImg(this.$content); + transcoder.classToStyle(this.$content); } return this.$content.html(); }, @@ -220,6 +220,8 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi this.$content.trigger('mouseup'); if (this.nodeOptions['style-inline']) { transcoder.styleToClass(this.$content); + transcoder.imgToFont(this.$content); + transcoder.linkImgToAttachmentThumbnail(this.$content); } // reset the history (otherwise clicking on undo before editing the // value will empty the editor) diff --git a/addons/web_editor/static/src/js/inline.js b/addons/web_editor/static/src/js/inline.js index 8715b5b7f24..4907379bcf4 100644 --- a/addons/web_editor/static/src/js/inline.js +++ b/addons/web_editor/static/src/js/inline.js @@ -41,6 +41,7 @@ snippet_editor.Class.include({ start: function () { _.defer(function () { var $editable = $('#editable_area'); + transcoder.linkImgToAttachmentThumbnail($editable); transcoder.imgToFont($editable); transcoder.styleToClass($editable); @@ -53,7 +54,7 @@ snippet_editor.Class.include({ this._super.apply(this, arguments); var $editable = $('#editable_area'); - transcoder.linkImgToAttachmentThumbnail($editable); + transcoder.attachmentThumbnailToLinkImg($editable); transcoder.fontToImg($editable); transcoder.classToStyle($editable);