sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emoji: Revert [46393] pending test failure investigation.

Browse Source 
See #46537.

git-svn-id: https://develop.svn.wordpress.org/trunk@46397 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-10-05 00:59:50 +00:00
parent 0200a429c7
commit c3c0007121
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/js/_enqueues/wp/emoji.js
View File

@ -121,11 +121,6 @@
while ( ii-- ) {
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 ) {
if ( ! node.parentNode ) {
@ -150,8 +145,14 @@
node = node.parentNode;
}
// Only make replacements inside Element nodes.
if ( node.nodeType !== 1 ) {
/*
* 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 ) ) {
continue;
}