sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emoji: Twemoji replacements weren't working in TinyMCE after [36816].

Browse Source 
See #35300.



git-svn-id: https://develop.svn.wordpress.org/trunk@36927 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2016-03-10 05:08:10 +00:00
parent 91513893c2
commit 17dc928316
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
View File

@ -1,4 +1,4 @@
( function( tinymce, wp ) {
( function( tinymce, wp, settings ) {
tinymce.PluginManager.add( 'wpemoji', function( editor ) {
var typing,
env = tinymce.Env,
@ -14,7 +14,7 @@
return false;
}());
if ( ! wp || ! wp.emoji || ! wp.emoji.replaceEmoji ) {
if ( ! wp || ! wp.emoji || settings.supports.everything ) {
return;
}
@ -125,4 +125,4 @@
}
} );
} );
} )( window.tinymce, window.wp );
} )( window.tinymce, window.wp, window._wpemojiSettings );