[FIX] website_mass_mailing: restore missing image files + snippets ref

Commit 9676ceec0260671cf86a27d02160f132378319a1 removed/replaced image files in mass_mailing
module but two of them were still used by website_mass_mailing.

This commits adds these two images in website_mass_mailing module and
use a more standard convention to define associated snippets and
link them in the snippet panel. Also lint JS files.

4 files changed, 25 insertions, 28 deletions

diff --git a/addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_form.png b/addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_form.png
new file mode 100644
index 00000000000..46a63ef9b00
--- /dev/null
+++ b/addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_form.png
diff --git a/addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_popup.png b/addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_popup.png
new file mode 100644
index 00000000000..c0cd2562ce6
--- /dev/null
+++ b/addons/website_mass_mailing/static/src/img/blocks/newsletter_subscribe_popup.png
diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js
index dac5bf785d8..66ad2879725 100644
--- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js
+++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js
@@ -51,17 +51,17 @@ options.registry.newsletter_popup = mass_mailing_common.extend({
         var self = this;
         if (type !== "click") return;
         return this._super(type, value).then(function (mailing_list_id) {
-                ajax.jsonRpc('/web/dataset/call', 'call', {
-                    model: 'mail.mass_mailing.list',
-                    method: 'read',
-                    args: [[parseInt(mailing_list_id)], ['popup_content'], base.get_context()],
-                }).then(function (data) {
-                    self.$target.find(".o_popup_content_dev").empty();
-                    if (data && data[0].popup_content) {
-                        $(data[0].popup_content).appendTo(self.$target.find(".o_popup_content_dev"));
-                    }
-                });
+            ajax.jsonRpc('/web/dataset/call', 'call', {
+                model: 'mail.mass_mailing.list',
+                method: 'read',
+                args: [[parseInt(mailing_list_id)], ['popup_content'], base.get_context()],
+            }).then(function (data) {
+                self.$target.find(".o_popup_content_dev").empty();
+                if (data && data[0].popup_content) {
+                    $(data[0].popup_content).appendTo(self.$target.find(".o_popup_content_dev"));
+                }
             });
+        });
     },
 });
 
@@ -84,9 +84,11 @@ web_editor.Class.include({
             ajax.jsonRpc('/web/dataset/call', 'call', {
                 model: 'mail.mass_mailing.list',
                 method: 'write',
-                args: [parseInt(newsletter_id),
-                   {'popup_content':content},
-                   base.get_context()],
+                args: [
+                    parseInt(newsletter_id),
+                    {'popup_content':content},
+                    base.get_context()
+                ],
             });
         }
         return this._super();
@@ -97,7 +99,4 @@ web_editor.Class.include({
         $('.modal-backdrop').css("z-index", "0");
     },
 });
-
 });
-
-
diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
index bdc76baa2ae..a9e8ea86273 100644
--- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
+++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js
@@ -4,8 +4,7 @@ odoo.define('mass_mailing.website_integration', function (require) {
 var ajax = require('web.ajax');
 var utils = require('web.utils');
 var animation = require('web_editor.snippets.animation');
-var website = require('website.website');
-
+require('web_editor.base');
 
 animation.registry.subscribe = animation.Class.extend({
     selector: ".js_subscribe",
@@ -102,9 +101,11 @@ animation.registry.newsletter_popup = animation.Class.extend({
             self.$target.find('#o_newsletter_popup').modal('hide');
             $(document).off('mouseleave');
             if (self.redirect_url) {
-                if (_.contains(self.redirect_url.split('/'), window.location.host) || self.redirect_url.indexOf('/')== 0) {
+                if (_.contains(self.redirect_url.split('/'), window.location.host) || self.redirect_url.indexOf('/') === 0) {
                     window.location.href = self.redirect_url;
-                } else { window.open(self.redirect_url, '_blank'); }
+                } else {
+                    window.open(self.redirect_url, '_blank');
+                }
             }
         });
     },
@@ -119,17 +120,15 @@ animation.registry.newsletter_popup = animation.Class.extend({
         }
     }
 });
-
 });
 
-
 odoo.define('mass_mailing.unsubscribe', function (require) {
-var ajax = require('web.ajax');
-require('web_editor.base');  // wait for implicit dependencies to load
+    var ajax = require('web.ajax');
+    require('web_editor.base'); // wait for implicit dependencies to load
 
-if(!$('.o_unsubscribe_form').length) {
-    return $.Deferred().reject("DOM doesn't contain '.o_unsubscribe_form'");
-}
+    if (!$('.o_unsubscribe_form').length) {
+        return $.Deferred().reject("DOM doesn't contain '.o_unsubscribe_form'");
+    }
 
     $('#unsubscribe_form').on('submit', function(e) {
         e.preventDefault();
@@ -155,5 +154,4 @@ if(!$('.o_unsubscribe_form').length) {
                 $('.alert-info').html('You changes has not been saved, try again later.').removeClass('alert-info').addClass('alert-warning');
             });
     });
-
 });