<!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>[35637] trunk/src/wp-includes/js: Emoji: Ensure twemoji kicks in on certain DOM mutations.</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/35637">35637</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/35637","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-14 09:51:02 +0000 (Sat, 14 Nov 2015)</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: Ensure twemoji kicks in on certain DOM mutations.
Twemoji will replace the `img` with the emoji character, in the event that the image fails to load. We deliberately avoid trying to change that emoji character when it's changed back. We do need to replace emoji characters that are changed by something other than Twemoji, which this rectifies.
Fixes <a href="https://core.trac.wordpress.org/ticket/34640">#34640</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstwemojijs">trunk/src/wp-includes/js/twemoji.js</a></li>
<li><a href="#trunksrcwpincludesjswpemojijs">trunk/src/wp-includes/js/wp-emoji.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjstwemojijs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/twemoji.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/twemoji.js 2015-11-13 15:46:12 UTC (rev 35636)
+++ trunk/src/wp-includes/js/twemoji.js 2015-11-14 09:51:02 UTC (rev 35637)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if (src) {
</span><span class="cx" style="display: block; padding: 0 10px"> img = new Image();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- img.onerror = twemoji.onerror;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ img.onerror = options.onerror;
</ins><span class="cx" style="display: block; padding: 0 10px"> img.setAttribute('draggable', 'false');
</span><span class="cx" style="display: block; padding: 0 10px"> attrib = options.attributes(icon, variant);
</span><span class="cx" style="display: block; padding: 0 10px"> for (attrname in attrib) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -550,7 +550,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> base: typeof how.base === 'string' ? how.base : twemoji.base,
</span><span class="cx" style="display: block; padding: 0 10px"> ext: how.ext || twemoji.ext,
</span><span class="cx" style="display: block; padding: 0 10px"> size: how.folder || toSizeSquaredAsset(how.size || twemoji.size),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- className: how.className || twemoji.className
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ className: how.className || twemoji.className,
+ onerror: how.onerror || twemoji.onerror
</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></pre></div>
<a id="trunksrcwpincludesjswpemojijs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/wp-emoji.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-emoji.js 2015-11-13 15:46:12 UTC (rev 35636)
+++ trunk/src/wp-includes/js/wp-emoji.js 2015-11-14 09:51:02 UTC (rev 35637)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ii === 1 && removedNodes.length === 1 &&
</span><span class="cx" style="display: block; padding: 0 10px"> addedNodes[0].nodeType === 3 &&
</span><span class="cx" style="display: block; padding: 0 10px"> removedNodes[0].nodeName === 'IMG' &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- addedNodes[0].data === removedNodes[0].alt
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ addedNodes[0].data === removedNodes[0].alt &&
+ 'load-failed' === removedNodes[0].getAttribute( 'data-error' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,6 +156,12 @@
</span><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"> return ''.concat( options.base, icon, options.ext );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+ onerror: function() {
+ if ( twemoji.parentNode ) {
+ this.setAttribute( 'data-error', 'load-failed' );
+ twemoji.parentNode.replaceChild( document.createTextNode( twemoji.alt ), twemoji );
+ }
</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></pre>
</div>
</div>
</body>
</html>