From 43cb03105bcb576f2fbbf8627017634d1a5b6fdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Mon, 9 Jan 2017 22:22:50 +0200
Subject: [PATCH 1/2] Change MailPoet JS assets to be loaded only on Admin
 Widgets page

---
 lib/Config/Widget.php | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/lib/Config/Widget.php b/lib/Config/Widget.php
index e340ce4d0c..f5a5f52aff 100644
--- a/lib/Config/Widget.php
+++ b/lib/Config/Widget.php
@@ -21,7 +21,7 @@ class Widget {
       $this->setupDependencies();
       $this->setupIframe();
     } else {
-      $this->setupAdminDependencies();
+      add_action('widgets_admin_page', array($this, 'setupAdminWidgetPageDependencies'));
     }
   }
 
@@ -110,26 +110,20 @@ class Widget {
     ));
   }
 
-  function setupAdminDependencies() {
-    if(
-      empty($_GET['page'])
-      or
-      isset($_GET['page']) && strpos($_GET['page'], 'mailpoet') === false
-    ) {
-      wp_enqueue_script('mailpoet_vendor',
-        Env::$assets_url.'/js/vendor.js',
-        array(),
-        Env::$version,
-        true
-      );
+  function setupAdminWidgetPageDependencies() {
+    wp_enqueue_script('mailpoet_vendor',
+      Env::$assets_url.'/js/vendor.js',
+      array(),
+      Env::$version,
+      true
+    );
 
-      wp_enqueue_script('mailpoet_admin',
-        Env::$assets_url.'/js/mailpoet.js',
-        array(),
-        Env::$version,
-        true
-      );
-    }
+    wp_enqueue_script('mailpoet_admin',
+      Env::$assets_url.'/js/mailpoet.js',
+      array(),
+      Env::$version,
+      true
+    );
   }
 
   // TODO: extract this method into an Initializer

From 76a41d53d6bef6b6dee83994cc002958400b7907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Mon, 9 Jan 2017 22:23:25 +0200
Subject: [PATCH 2/2] Remove unused dependencies from I18n and newsletter
 editor scripts

---
 assets/js/src/i18n.js                  | 6 ++----
 assets/js/src/newsletter_editor/App.js | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/assets/js/src/i18n.js b/assets/js/src/i18n.js
index 215d7b7e0f..1dcfa27a3f 100644
--- a/assets/js/src/i18n.js
+++ b/assets/js/src/i18n.js
@@ -1,10 +1,8 @@
 define('i18n',
   [
-    'mailpoet',
-    'underscore',
+    'mailpoet'
   ], function(
-    MailPoet,
-    _
+    MailPoet
 ) {
   'use strict';
 
diff --git a/assets/js/src/newsletter_editor/App.js b/assets/js/src/newsletter_editor/App.js
index 92b272d3fd..725e5442e7 100644
--- a/assets/js/src/newsletter_editor/App.js
+++ b/assets/js/src/newsletter_editor/App.js
@@ -1,12 +1,11 @@
 define([
     'backbone',
     'backbone.marionette',
-    'backbone.supermodel',
     'jquery',
     'underscore',
     'handlebars',
     'handlebars_helpers'
-  ], function(Backbone, Marionette, SuperModel, jQuery, _, Handlebars) {
+  ], function(Backbone, Marionette, jQuery, _, Handlebars) {
 
   var app = new Marionette.Application(), AppView;