Changeset 31756

Timestamp:

03/12/2015 07:52:13 PM (10 years ago)

Author:

azaozz

Message:

Emoji:

• Patch twemoji.js to prevent infinite loop.
• Fix some undefined errors in old IE.

Props iseulde. See #31242.

Location:

trunk/src/wp-includes

Files:

• js/twemoji.js (modified) (1 diff)
• js/wp-emoji.js (modified) (4 diffs)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/js/twemoji.js

@@ -371 +371 @@
         }
         fragment.appendChild(img || createText(alt));
-        img = null;
       }
       // is there actually anything to replace in here ?
-      if (0 < i) {
+      if (img) {
+        img = null;
         // any text left to be added ?
         if (i < text.length) {

trunk/src/wp-includes/js/wp-emoji.js

@@ -2 +2 @@
 
 ( function( window, wp, twemoji, settings ) {
+    var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver;
+
     var emoji = {
         /**
@@ -69 +71 @@
                             }
 
-                            if ( node.nodeType === 1 ) {
+                            if ( node && node.nodeType === 1 ) {
                                 emoji.parse( node );
                             }
@@ -96 +98 @@
                 context = canvas.getContext && canvas.getContext( '2d' );
 
-            if ( ! context.fillText ) {
+            if ( ! context || ! context.fillText ) {
                 return false;
             }
@@ -124 +126 @@
                 context = canvas.getContext && canvas.getContext( '2d' );
 
-            if ( ! context.fillText ) {
+            if ( ! context || ! context.fillText ) {
                 return false;
             }

trunk/src/wp-includes/script-loader.php

@@ -435 +435 @@
          * @param string The emoji base URL.
          */
-        'baseUrl' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ),
+        'baseUrl' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72' ),
         /**
          * Filter the extension of the emoji files.