Changeset 36927

Timestamp:

03/10/2016 05:08:10 AM (9 years ago)

Author:

pento

Message:

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

See #35300.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js (modified) (3 diffs)

trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js

@@ -1 @@
-( function( tinymce, wp ) {
+( function( tinymce, wp, settings ) {
     tinymce.PluginManager.add( 'wpemoji', function( editor ) {
         var typing,
@@ -15 +15 @@
             }());
 
-        if ( ! wp || ! wp.emoji || ! wp.emoji.replaceEmoji ) {
+        if ( ! wp || ! wp.emoji || settings.supports.everything ) {
             return;
         }
@@ -126 +126 @@
         } );
     } );
-} )( window.tinymce, window.wp );
+} )( window.tinymce, window.wp, window._wpemojiSettings );