From 992cc2e79616f44ee906437d43715f0db460a7a0 Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Sun, 3 May 2015 20:17:38 +0000 Subject: [PATCH] Emoji: add an exclude class to wp-emoji checked when monitoring for changes with mutationObserver. Use it for the hidden div used for resizing the Text editor. See #32197. git-svn-id: https://develop.svn.wordpress.org/trunk@32336 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/editor-expand.js | 2 +- src/wp-includes/js/wp-emoji.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/js/editor-expand.js b/src/wp-admin/js/editor-expand.js index db7561e62a..4165985e11 100644 --- a/src/wp-admin/js/editor-expand.js +++ b/src/wp-admin/js/editor-expand.js @@ -15,7 +15,7 @@ $visualEditor = $(), $textTop = $( '#ed_toolbar' ), $textEditor = $( '#content' ), - $textEditorClone = $( '
' ), + $textEditorClone = $( '
' ), $bottom = $( '#post-status-info' ), $menuBar = $(), $statusBar = $(), diff --git a/src/wp-includes/js/wp-emoji.js b/src/wp-includes/js/wp-emoji.js index eed3fe389e..d925496aa4 100644 --- a/src/wp-includes/js/wp-emoji.js +++ b/src/wp-includes/js/wp-emoji.js @@ -70,7 +70,11 @@ node = node.parentNode; } - if ( node && node.nodeType === 1 && test( node.textContent ) ) { + if ( ! node || ( node.className && node.className.indexOf( 'wp-no-emoji' ) !== -1 ) ) { + continue; + } + + if ( node.nodeType === 1 && test( node.textContent ) ) { parse( node ); } }