Merge pull request #1067 from mailpoet/emoji

Add emoji support to newsletter body [MAILPOET-1009]
This commit is contained in:
mrcasual
2017-08-30 10:04:26 -04:00
committed by GitHub
6 changed files with 174 additions and 7 deletions

View File

@@ -59,6 +59,11 @@ class Menu {
if(self::isOnMailPoetAdminPage()) {
do_action('mailpoet_conflict_resolver_styles');
do_action('mailpoet_conflict_resolver_scripts');
if($_REQUEST['page'] === 'mailpoet-newsletter-editor') {
// Disable WP emojis to not interfere with the newsletter editor emoji handling
$this->disableWPEmojis();
}
}
// Main page
@@ -314,6 +319,11 @@ class Menu {
);
}
function disableWPEmojis() {
remove_action('admin_print_scripts', 'print_emoji_detection_script');
remove_action('admin_print_styles', 'print_emoji_styles');
}
function welcome() {
if((bool)(defined('DOING_AJAX') && DOING_AJAX)) return;