Changeset 46393

Timestamp:

10/04/2019 11:28:22 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Emoji: Stop emoji replacement from happening inside CodeMirror instances, and clean up some logic in the MutationObserver.

Props pento, hirofumi2012, davidbaumwald.
Fixes #46537.

File:

• trunk/src/js/_enqueues/wp/emoji.js (modified) (2 diffs)

trunk/src/js/_enqueues/wp/emoji.js

@@ -122 +122 @@
                                                         node = addedNodes[ ii ];
 
+                                                        // Don't replace emoji inside elements that don't support it.
+                                                        if ( ! node || node.closest( '.wp-exclude-emoji' ) || node.closest( '.CodeMirror' ) ) {
+                                                                continue;
+                                                        }
+
                                                         // Node type 3 is a TEXT_NODE.
                                                         if ( node.nodeType === 3 ) {
@@ -146 +151 @@
                                                         }
 
-                                                        /*
-                                                         * If the class name of a non-element node contains 'wp-exclude-emoji' ignore it.
-                                                         *
-                                                         * Node type 1 is an ELEMENT_NODE.
-                                                         */
-                                                        if ( ! node || node.nodeType !== 1 ||
-                                                                ( node.className && typeof node.className === 'string' && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) {
-
+                                                        // Only make replacements inside Element nodes.
+                                                        if ( node.nodeType !== 1 ) {
                                                                 continue;
                                                         }