--- a/wp/wp-includes/js/wp-emoji.js Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-includes/js/wp-emoji.js Mon Oct 14 17:39:30 2019 +0200
@@ -3,19 +3,33 @@
function wpEmoji() {
var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
- /**
- * Flag to determine if we should replace emoji characters with images.
- *
- * @since 4.2.0
- *
- * @var Boolean
- */
- replaceEmoji = false,
+ // Compression and maintain local scope
+ document = window.document,
// Private
twemoji, timer,
loaded = false,
- count = 0;
+ count = 0,
+ ie11 = window.navigator.userAgent.indexOf( 'Trident/7.0' ) > 0;
+
+ /**
+ * Detect if the browser supports SVG.
+ *
+ * @since 4.6.0
+ *
+ * @return {Boolean} True if the browser supports svg, false if not.
+ */
+ function browserSupportsSvgAsImage() {
+ if ( !! document.implementation.hasFeature ) {
+ // Source: Modernizr
+ // https://github.com/Modernizr/Modernizr/blob/master/feature-detects/svg/asimg.js
+ return document.implementation.hasFeature( 'http://www.w3.org/TR/SVG11/feature#Image', '1.1' );
+ }
+
+ // document.implementation.hasFeature is deprecated. It can be presumed
+ // if future browsers remove it, the browser will support SVGs as images.
+ return true;
+ }
/**
* Runs when the document load event is fired, so we can do our first parse of the page.
@@ -58,7 +72,8 @@
ii === 1 && removedNodes.length === 1 &&
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;
}
@@ -67,14 +82,33 @@
node = addedNodes[ ii ];
if ( node.nodeType === 3 ) {
+ if ( ! node.parentNode ) {
+ continue;
+ }
+
+ if ( ie11 ) {
+ /*
+ * IE 11's implementation of MutationObserver is buggy.
+ * It unnecessarily splits text nodes when it encounters a HTML
+ * template interpolation symbol ( "{{", for example ). So, we
+ * join the text nodes back together as a work-around.
+ */
+ while( node.nextSibling && 3 === node.nextSibling.nodeType ) {
+ node.nodeValue = node.nodeValue + node.nextSibling.nodeValue;
+ node.parentNode.removeChild( node.nextSibling );
+ }
+ }
+
node = node.parentNode;
}
- if ( ! node || ( node.className && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) {
+ if ( ! node || node.nodeType !== 1 ||
+ ( node.className && typeof node.className === 'string' && node.className.indexOf( 'wp-exclude-emoji' ) !== -1 ) ) {
+
continue;
}
- if ( node && node.nodeType === 1 ) {
+ if ( test( node.textContent ) ) {
parse( node );
}
}
@@ -89,6 +123,28 @@
}
/**
+ * Test if a text string contains emoji characters.
+ *
+ * @since 4.3.0
+ *
+ * @param {String} text The string to test
+ *
+ * @return {Boolean} Whether the string contains emoji characters.
+ */
+ function test( text ) {
+ // Single char. U+20E3 to detect keycaps. U+00A9 "copyright sign" and U+00AE "registered sign" not included.
+ var single = /[\u203C\u2049\u20E3\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2300\u231A\u231B\u2328\u2388\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638\u2639\u263A\u2648-\u2653\u2660\u2663\u2665\u2666\u2668\u267B\u267F\u2692\u2693\u2694\u2696\u2697\u2699\u269B\u269C\u26A0\u26A1\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753\u2754\u2755\u2757\u2763\u2764\u2795\u2796\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05\u2B06\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]/,
+ // Surrogate pair range. Only tests for the second half.
+ pair = /[\uDC00-\uDFFF]/;
+
+ if ( text ) {
+ return pair.test( text ) || single.test( text );
+ }
+
+ return false;
+ }
+
+ /**
* Given an element or string, parse any emoji characters into Twemoji images.
*
* @since 4.2.0
@@ -97,17 +153,19 @@
* @param {Object} args Additional options for Twemoji.
*/
function parse( object, args ) {
- if ( ! replaceEmoji || ! twemoji ) {
+ var params;
+
+ if ( settings.supports.everything || ! twemoji || ! object ||
+ ( 'string' !== typeof object && ( ! object.childNodes || ! object.childNodes.length ) ) ) {
+
return object;
}
args = args || {};
-
- return twemoji.parse( object, {
- base: settings.baseUrl,
- ext: settings.ext,
+ params = {
+ base: browserSupportsSvgAsImage() ? settings.svgUrl : settings.baseUrl,
+ ext: browserSupportsSvgAsImage() ? settings.svgExt : settings.ext,
className: args.className || 'emoji',
- imgAttr: args.imgAttr,
callback: function( icon, options ) {
// Ignore some standard characters that TinyMCE recommends in its character map.
switch ( icon ) {
@@ -122,23 +180,36 @@
return false;
}
- if ( ! settings.supports.flag && settings.supports.simple &&
- ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) ) {
-
+ if ( settings.supports.everythingExceptFlag &&
+ ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) && // Country flags
+ ! /^(1f3f3-fe0f-200d-1f308|1f3f4-200d-2620-fe0f)$/.test( icon ) // Rainbow and pirate flags
+ ) {
return false;
}
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 );
+ }
}
- } );
+ };
+
+ if ( typeof args.imgAttr === 'object' ) {
+ params.attributes = function() {
+ return args.imgAttr;
+ };
+ }
+
+ return twemoji.parse( object, params );
}
/**
* Initialize our emoji support, and set up listeners.
*/
if ( settings ) {
- replaceEmoji = ! settings.supports.simple || ! settings.supports.flag;
-
if ( settings.DOMReady ) {
load();
} else {
@@ -147,8 +218,8 @@
}
return {
- replaceEmoji: replaceEmoji,
- parse: parse
+ parse: parse,
+ test: test
};
}