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

34
lib/Config/Widget.php
View File

@ -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