<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[41394] branches/4.8: Emoji: Update Twemoji to 2.5.0.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/41394">41394</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/41394","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-19 08:03:36 +0000 (Tue, 19 Sep 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Emoji: Update Twemoji to 2.5.0.
* Twemoji 2.3.0 has a rendering issue in Safari, emoji can sometimes be followed by U+FEOF (which is just a flag meaning "render the preceding character as emoji).
* Twemoji wasn't catching this character correctly, and Safari rendered it incorrectly.
* Twemoji 2.5.0 resolves this issue.
Merge of <a href="https://core.trac.wordpress.org/changeset/41250">[41250]</a> to the 4.8 branch.
Props peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/41584">#41584</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches48srcwpincludesjstwemojijs">branches/4.8/src/wp-includes/js/twemoji.js</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches48">branches/4.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.8
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.8 2017-09-19 08:00:40 UTC (rev 41393)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.8 2017-09-19 08:03:36 UTC (rev 41394)
</ins><a id="branches48"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41251,41260,41294,41335
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,40872-40873,40879,40881,40883,40885,40892-40893,40896-40897,40901,40926-40927,40939,40941,40961,40990-40991,40995,41000,41009,41020,41022,41028,41035,41037,41047,41050,41070,41072,41086,41088,41094,41112,41115-41116,41132,41134,41136,41139,41141,41250-41251,41260,41294,41335
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches48srcwpincludesjstwemojijs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.8/src/wp-includes/js/twemoji.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.8/src/wp-includes/js/twemoji.js 2017-09-19 08:00:40 UTC (rev 41393)
+++ branches/4.8/src/wp-includes/js/twemoji.js 2017-09-19 08:03:36 UTC (rev 41394)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> onerror: function onerror() {
</span><span class="cx" style="display: block; padding: 0 10px"> if (this.parentNode) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.parentNode.replaceChild(createText(this.alt), this);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.parentNode.replaceChild(createText(this.alt, false), this);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,13 +159,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @example
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * twemoji.parse("I \u2764\uFE0F emoji!");
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * // I <img class="emoji" draggable="false" alt="❤️" src="/assets/2764.gif"> emoji!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * // I <img class="emoji" draggable="false" alt="❤️" src="/assets/2764.gif"/> emoji!
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * twemoji.parse("I \u2764\uFE0F emoji!", function(iconId, options) {
</span><span class="cx" style="display: block; padding: 0 10px"> * return '/assets/' + iconId + '.gif';
</span><span class="cx" style="display: block; padding: 0 10px"> * });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * // I <img class="emoji" draggable="false" alt="❤️" src="/assets/2764.gif"> emoji!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * // I <img class="emoji" draggable="false" alt="❤️" src="/assets/2764.gif"/> emoji!
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * twemoji.parse("I \u2764\uFE0F emoji!", {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * return '/assets/' + options.size + '/' + iconId + options.ext;
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * });
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * // I <img class="emoji" draggable="false" alt="❤️" src="/assets/72x72/2764.png"> emoji!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * // I <img class="emoji" draggable="false" alt="❤️" src="/assets/72x72/2764.png"/> emoji!
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> parse: parse,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -237,8 +237,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // used to find HTML special chars in attributes
</span><span class="cx" style="display: block; padding: 0 10px"> rescaper = /[&<>'"]/g,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // nodes with type 1 which should **not** be parsed (including lower case svg)
- shouldntBeParsed = /IFRAME|NOFRAMES|NOSCRIPT|SCRIPT|SELECT|STYLE|TEXTAREA|[a-z]/,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // nodes with type 1 which should **not** be parsed
+ shouldntBeParsed = /^(?:iframe|noframes|noscript|script|select|style|textarea)$/,
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // just a private shortcut
</span><span class="cx" style="display: block; padding: 0 10px"> fromCharCode = String.fromCharCode;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,8 +256,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string text used to create DOM text node
</span><span class="cx" style="display: block; padding: 0 10px"> * @return Node a DOM node with that text
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function createText(text) {
- return document.createTextNode(text);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function createText(text, clean) {
+ return document.createTextNode(clean ? text.replace(UFE0Fg, '') : text);
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,9 +301,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // collect them to process emoji later
</span><span class="cx" style="display: block; padding: 0 10px"> allText.push(subnode);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // ignore all nodes that are not type 1 or that
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // ignore all nodes that are not type 1, that are svg, or that
</ins><span class="cx" style="display: block; padding: 0 10px"> // should not be parsed as script, style, and others
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if (nodeType === 1 && !shouldntBeParsed.test(subnode.nodeName)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ else if (nodeType === 1 && !('ownerSVGElement' in subnode) &&
+ !shouldntBeParsed.test(subnode.nodeName.toLowerCase())) {
</ins><span class="cx" style="display: block; padding: 0 10px"> grabAllTextNodes(subnode, allText);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,7 +366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> index = match.index;
</span><span class="cx" style="display: block; padding: 0 10px"> if (index !== i) {
</span><span class="cx" style="display: block; padding: 0 10px"> fragment.appendChild(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- createText(text.slice(i, index))
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createText(text.slice(i, index), true)
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> rawText = match[0];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -393,7 +394,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> modified = true;
</span><span class="cx" style="display: block; padding: 0 10px"> fragment.appendChild(img);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (!img) fragment.appendChild(createText(rawText));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (!img) fragment.appendChild(createText(rawText, false));
</ins><span class="cx" style="display: block; padding: 0 10px"> img = null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // is there actually anything to replace in here ?
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // any text left to be added ?
</span><span class="cx" style="display: block; padding: 0 10px"> if (i < text.length) {
</span><span class="cx" style="display: block; padding: 0 10px"> fragment.appendChild(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- createText(text.slice(i))
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ createText(text.slice(i), true)
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // replace the text node only, leave intact
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ret = ret.concat(' ', attrname, '="', escapeHTML(attrib[attrname]), '"');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ret = ret.concat('>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ret = ret.concat('/>');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return ret;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre>
</div>
</div>
</body>
</html>