[FIX] mass_mailing, web_editor: set up correct iframe communication

Previous commit tried to handle iframe assets in a more standard way
but instead broke the order followed to install iframe communication.

While waiting for a more clean way to handle iframe assets and
communication, revert to old set up.

1 files changed, 4 insertions, 7 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 c5a84df95bd..1ad2cf2c784 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_editor.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_editor.js
@@ -9,10 +9,6 @@ var options = require('web_editor.snippets.options');
 var snippets_editor = require('web_editor.snippet.editor');
 
 var $editable_area = $("#editable_area");
-if ($editable_area.length === 0 || !$editable_area.is(".o_mail_area")) {
-    return;
-}
-
 var odoo_top = window.top.odoo;
 
 // Snippet option for resizing  image and column width inline like excel
@@ -351,9 +347,10 @@ snippets_editor.Class.include({
     },
 });
 
-odoo_top[window["callback"]+"_updown"] = function (value, fields_values, field_name) {
+var callback = window ? window["callback"] : undefined;
+odoo_top[callback+"_updown"] = function (value, fields_values, field_name) {
     if (!window) {
-        delete odoo_top[window["callback"]+"_updown"];
+        delete odoo_top[callback+"_updown"];
         return;
     }
 
@@ -383,7 +380,7 @@ odoo_top[window["callback"]+"_updown"] = function (value, fields_values, field_n
 
     if (fields_values.mailing_model && web_editor.editor_bar) {
         if (value.indexOf('on_change_model_and_list') !== -1) {
-            odoo_top[window["callback"]+"_downup"](_val);
+            odoo_top[callback+"_downup"](_val);
         }
     }
 };