<!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>[40626] trunk: Emoji: Update Twemoji to version 2.2.5</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/40626">40626</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/40626","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-11 04:25:22 +0000 (Thu, 11 May 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 version 2.2.5
Updates Twemoji and adds a second Emoji 4 test to include a shrugging man. Emoji 4 is being implemented gradually, while some browsers now support the female technologist, the indifferent shrugging man is breaking things with his presence.
Props peterwilsoncc, pento for code review.
Fixes <a href="https://core.trac.wordpress.org/ticket/40615">#40615</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesjswpemojiloaderjs">trunk/src/wp-includes/js/wp-emoji-loader.js</a></li>
<li><a href="#trunktestsphpunittestsformattingEmojiphp">trunk/tests/phpunit/tests/formatting/Emoji.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2017-05-11 01:01:36 UTC (rev 40625)
+++ trunk/src/wp-includes/formatting.php 2017-05-11 04:25:22 UTC (rev 40626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5012,7 +5012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string The emoji base URL for png images.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.2.1/72x72/' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.2.5/72x72/' ),
</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"> * Filters the extension of the emoji png files.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5030,7 +5030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string The emoji base URL for svg images.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.1/svg/' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.5/svg/' ),
</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"> * Filters the extension of the emoji SVG files.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5142,7 +5142,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = wp_encode_emoji( $text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/formatting.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.2.1/72x72/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.2.5/72x72/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/formatting.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = apply_filters( 'emoji_ext', '.png' );
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2017-05-11 01:01:36 UTC (rev 40625)
+++ trunk/src/wp-includes/general-template.php 2017-05-11 04:25:22 UTC (rev 40626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2845,7 +2845,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The path is removed in the foreach loop below.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/formatting.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.1/svg/' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.5/svg/' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $hints as $relation_type => $urls ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $unique_urls = array();
</span></span></pre></div>
<a id="trunksrcwpincludesjswpemojiloaderjs"></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-loader.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-emoji-loader.js 2017-05-11 01:01:36 UTC (rev 40625)
+++ trunk/src/wp-includes/js/wp-emoji-loader.js 2017-05-11 04:25:22 UTC (rev 40626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function browserSupportsEmoji( type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var stringFromCharCode = String.fromCharCode,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- flag, flag2, technologist, technologist2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ flag, flag2, emoji41, emoji42;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! context || ! context.fillText ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,21 +80,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return flag !== flag2;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'emoji4':
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Emoji 4 support was implemented gradually, multiple tests are used to
+ * confirm support.
+ *
+ * In this test we try rendering man shrugging, light skin tone and compare
+ * it to how it would look if the browser does not render it correctly
+ * (person shrugging: light skin town + male sign).
+ */
+ context.fillText( stringFromCharCode( 55358, 56631, 55356, 57339, 8205, 9794, 65039 ), 0, 0 );
+ emoji41 = canvas.toDataURL();
+
+ context.clearRect( 0, 0, canvas.width, canvas.height );
+
+ context.fillText( stringFromCharCode( 55358, 56631, 55356, 57339, 9794, 65039 ), 0, 0 );
+ emoji42 = canvas.toDataURL();
+
+ if ( emoji41 !== emoji42 ) {
+ return false;
+ }
+
+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * Emoji 4 has the best technologists. So does WordPress!
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * To test for support, try to render a new emoji (woman technologist: medium skin tone),
</span><span class="cx" style="display: block; padding: 0 10px"> * then compare it to how it would look if the browser doesn't render it correctly
</span><span class="cx" style="display: block; padding: 0 10px"> * (woman technologist: medium skin tone + personal computer).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Cleanup from previous test.
+ context.clearRect( 0, 0, canvas.width, canvas.height );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> context.fillText( stringFromCharCode( 55357, 56425, 55356, 57341, 8205, 55357, 56507), 0, 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- technologist = canvas.toDataURL();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emoji41 = canvas.toDataURL();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> context.clearRect( 0, 0, canvas.width, canvas.height );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> context.fillText( stringFromCharCode( 55357, 56425, 55356, 57341, 55357, 56507), 0, 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- technologist2 = canvas.toDataURL();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emoji42 = canvas.toDataURL();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return technologist !== technologist2;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return emoji41 !== emoji42;
</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"> return false;
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingEmojiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/Emoji.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Emoji.php 2017-05-11 01:01:36 UTC (rev 40625)
+++ trunk/tests/phpunit/tests/formatting/Emoji.php 2017-05-11 04:25:22 UTC (rev 40626)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36525
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_unfiltered_emoji_cdns() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $png_cdn = 'https://s.w.org/images/core/emoji/2.2.1/72x72/';
- $svn_cdn = 'https://s.w.org/images/core/emoji/2.2.1/svg/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $png_cdn = 'https://s.w.org/images/core/emoji/2.2.5/72x72/';
+ $svn_cdn = 'https://s.w.org/images/core/emoji/2.2.5/svg/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = get_echo( '_print_emoji_detection_script' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36525
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_filtered_emoji_svn_cdn() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $png_cdn = 'https://s.w.org/images/core/emoji/2.2.1/72x72/';
- $svn_cdn = 'https://s.w.org/images/core/emoji/2.2.1/svg/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $png_cdn = 'https://s.w.org/images/core/emoji/2.2.5/72x72/';
+ $svn_cdn = 'https://s.w.org/images/core/emoji/2.2.5/svg/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_svn_cdn = $this->_filtered_emoji_svn_cdn();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 36525
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_filtered_emoji_png_cdn() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $png_cdn = 'https://s.w.org/images/core/emoji/2.2.1/72x72/';
- $svn_cdn = 'https://s.w.org/images/core/emoji/2.2.1/svg/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $png_cdn = 'https://s.w.org/images/core/emoji/2.2.5/72x72/';
+ $svn_cdn = 'https://s.w.org/images/core/emoji/2.2.5/svg/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_png_cdn = $this->_filtered_emoji_png_cdn();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>