Changeset 35637

Timestamp:

11/14/2015 09:51:02 AM (8 years ago)

Author:

pento

Message:

Emoji: Ensure twemoji kicks in on certain DOM mutations.

Twemoji will replace the img with the emoji character, in the event that the image fails to load. We deliberately avoid trying to change that emoji character when it's changed back. We do need to replace emoji characters that are changed by something other than Twemoji, which this rectifies.

Fixes #34640.

Location:

trunk/src/wp-includes/js

Files:

• twemoji.js (modified) (2 diffs)
• wp-emoji.js (modified) (2 diffs)

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

@@ -387 +387 @@
           if (src) {
             img = new Image();
-            img.onerror = twemoji.onerror;
+            img.onerror = options.onerror;
             img.setAttribute('draggable', 'false');
             attrib = options.attributes(icon, variant);
@@ -551 +551 @@
       ext:        how.ext || twemoji.ext,
       size:       how.folder || toSizeSquaredAsset(how.size || twemoji.size),
-      className:  how.className || twemoji.className
+      className:  how.className || twemoji.className,
+      onerror:    how.onerror || twemoji.onerror
     });
   }

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

@@ -59 +59 @@
                             addedNodes[0].nodeType === 3 &&
                             removedNodes[0].nodeName === 'IMG' &&
-                            addedNodes[0].data === removedNodes[0].alt
+                            addedNodes[0].data === removedNodes[0].alt &&
+                            'load-failed' === removedNodes[0].getAttribute( 'data-error' )
                         ) {
                             return;
@@ -156 +157 @@
 
                     return ''.concat( options.base, icon, options.ext );
+                },
+                onerror: function() {
+                    if ( twemoji.parentNode ) {
+                        this.setAttribute( 'data-error', 'load-failed' );
+                        twemoji.parentNode.replaceChild( document.createTextNode( twemoji.alt ), twemoji );
+                    }
                 }
             };