Changeset 32142

Timestamp:

04/18/2015 11:28:11 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE: use window.twemoji directly in the wpemoji plugin. Gives a chance to the browser to lazy load twemoji.js when reloading the page.
Fixes #31901.

File:

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

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

@@ -1 @@
-( function( tinymce, wp, twemoji ) {
+( function( tinymce, wp ) {
         tinymce.PluginManager.add( 'wpemoji', function( editor ) {
                 var typing,
@@ -40 +40 @@
                         var selection, bookmark;
 
-                        if ( node && twemoji.test( node.textContent || node.innerText ) ) {
+                        if ( node && window.twemoji && window.twemoji.test( node.textContent || node.innerText ) ) {
                                 if ( env.webkit ) {
                                         selection = editor.selection;
@@ -84 +84 @@
                                 node = selection.getNode();
 
-                        if ( twemoji.test( node.textContent || node.innerText ) ) {
+                        if ( window.twemoji && window.twemoji.test( node.textContent || node.innerText ) ) {
                                 replaceEmoji( node );
 
@@ -97 +97 @@
                 // Convert Twemoji compatible pasted emoji replacement images into our format.
                 editor.on( 'PastePostProcess', function( event ) {
-                        if ( twemoji ) {
+                        if ( window.twemoji ) {
                                 tinymce.each( editor.dom.$( 'img.emoji', event.node ), function( image ) {
-                                        if ( image.alt && twemoji.test( image.alt ) ) {
+                                        if ( image.alt && window.twemoji.test( image.alt ) ) {
                                                 setImgAttr( image );
                                         }
@@ -126 +126 @@
                 } );
         } );
-} )( window.tinymce, window.wp, window.twemoji );
+} )( window.tinymce, window.wp );