summaryrefslogtreecommitdiff
path: root/addons/mass_mailing/static/src/js/mass_mailing_editor.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-11-15 15:50:36 +0100
committerChristophe Simonis <chs@odoo.com>2017-11-15 15:50:36 +0100
commit5877b7b38c6724e989b8eb361bcc48b714a2edd6 (patch)
tree3b7e178b68d1ffe46c601c34faea797bcbfe464c /addons/mass_mailing/static/src/js/mass_mailing_editor.js
parent6158c5ce04589d7e51928d2d19aa5b2eec05cebf (diff)
parent73e4dacf78a840acbd2bac1dc42ae790f58225aa (diff)
[MERGE] forward port branch saas-15 up to 73e4dacf78a
Diffstat (limited to 'addons/mass_mailing/static/src/js/mass_mailing_editor.js')
-rw-r--r--addons/mass_mailing/static/src/js/mass_mailing_editor.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_editor.js b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
index 56714a4ad39..70a50131706 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -327,7 +327,6 @@ snippets_editor.Class.include({
switch_theme.last = theme_params;
$body.removeClass(all_classes).addClass(theme_params.className);
- switch_images(theme_params, $editable_area);
var $old_layout = $editable_area.find(".o_layout");
// This wrapper structure is the only way to have a responsive and
@@ -357,8 +356,9 @@ snippets_editor.Class.include({
$contents = $editable_area.contents();
}
- $editable_area.empty().append($new_layout);
$new_wrapper_content.append($contents);
+ switch_images(theme_params, $new_wrapper_content);
+ $editable_area.empty().append($new_layout);
$old_layout.remove();
if (first_choice) {