Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #776 from mailpoet/js_conflict

Browse Source 
Load MailPoet assets only on Widgets admin page [MAILPOET-740]
This commit is contained in:
mrcasual
2017-01-09 15:38:52 -05:00
committed by GitHub
parent 3647f70daa 76a41d53d6
commit 3e734b5c44
3 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/src/i18n.js
View File

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

3
assets/js/src/newsletter_editor/App.js
View File

@ -1,12 +1,11 @@
define([ define([
'backbone', 'backbone',
'backbone.marionette', 'backbone.marionette',
'backbone.supermodel',
'jquery', 'jquery',
'underscore', 'underscore',
'handlebars', 'handlebars',
'handlebars_helpers' 'handlebars_helpers'
], function(Backbone, Marionette, SuperModel, jQuery, _, Handlebars) { ], function(Backbone, Marionette, jQuery, _, Handlebars) {
var app = new Marionette.Application(), AppView; var app = new Marionette.Application(), AppView;

34
lib/Config/Widget.php
View File

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