WordPress 4.5

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / plugins / wpemoji / plugin.js

diff --git a/wp-includes/js/tinymce/plugins/wpemoji/plugin.js b/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
index e197187007736415a55ea82e717cdc8f3e50a44f..ea6a62996c3d3f766d8bf2e22f1b20db37d6ebb4 100644 (file)
--- a/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
+++ b/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
@@ -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 );