Merge pull request #776 from mailpoet/js_conflict

Load MailPoet assets only on Widgets admin page [MAILPOET-740]

assets/js/src/i18n.js

@@ -1,10 +1,8 @@
 define('i18n',
   [
-    'mailpoet',
-    'underscore',
+    'mailpoet'
   ], function(
-    MailPoet,
-    _
+    MailPoet
 ) {
   'use strict';
 

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;
 

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