diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-13 14:45:51 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-13 14:45:51 +0100 |
| commit | abfd662109186bbd2df1267d38654893e2cf652b (patch) | |
| tree | 6c57a6673337f2c77969b2a9cd3bb48157091616 /addons/mass_mailing/static/src | |
| parent | 3768cce7480821bc206b9502005f9c24ccd1c09e (diff) | |
| parent | 9822c42707cab575b4a173b60569da1a1c6725aa (diff) | |
[MERGE] forward port branch 10.0 up to 9822c42707c
Diffstat (limited to 'addons/mass_mailing/static/src')
| -rw-r--r-- | addons/mass_mailing/static/src/js/mass_mailing_editor.js | 4 |
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 cc0b9d2dd08..9e62986b383 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js @@ -326,7 +326,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 @@ -349,8 +348,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) { |