<!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>[35606] trunk/src/wp-includes/js: Emoji: Use twemoji in browsers that don't support Unicode 8 emoji.</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/35606">35606</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/35606","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-11 02:24:40 +0000 (Wed, 11 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: Use twemoji in browsers that don't support Unicode 8 emoji.
Some less advanced browsers are yet to add support for the important advances made in Unicode 8. Let's make ensure that their users can experience emoji in their full glory.
See <a href="https://core.trac.wordpress.org/ticket/33592">#33592</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjswpemojiloaderjs">trunk/src/wp-includes/js/wp-emoji-loader.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="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 2015-11-11 00:23:15 UTC (rev 35605)
+++ trunk/src/wp-includes/js/wp-emoji-loader.js 2015-11-11 02:24:40 UTC (rev 35606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,25 +26,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> context.textBaseline = 'top';
</span><span class="cx" style="display: block; padding: 0 10px"> context.font = '600 32px Arial';
</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 ( type === 'flag' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'flag' === type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This works because the image will be one of three things:
</span><span class="cx" style="display: block; padding: 0 10px"> * - Two empty squares, if the browser doesn't render emoji
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - Two squares with 'G' and 'B' in them, if the browser doesn't render flag emoji
- * - The British flag
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Two squares with 'A' and 'U' in them, if the browser doesn't render flag emoji
+ * - The Australian flag
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The first two will encode to small images (1-2KB data URLs), the third will encode
</span><span class="cx" style="display: block; padding: 0 10px"> * to a larger image (4-5KB data URL).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- context.fillText( String.fromCharCode( 55356, 56812, 55356, 56807 ), 0, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ context.fillText( String.fromCharCode( 55356, 56806, 55356, 56826 ), 0, 0 );
</ins><span class="cx" style="display: block; padding: 0 10px"> return canvas.toDataURL().length > 3000;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * This creates a smiling emoji, and checks to see if there is any image data in the
- * center pixel. In browsers that don't support emoji, the character will be rendered
- * as an empty square, so the center pixel will be blank.
- */
- context.fillText( String.fromCharCode( 55357, 56835 ), 0, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'simple' === type ) {
+ /*
+ * This creates a smiling emoji, and checks to see if there is any image data in the
+ * center pixel. In browsers that don't support emoji, the character will be rendered
+ * as an empty square, so the center pixel will be blank.
+ */
+ context.fillText( String.fromCharCode( 55357, 56835 ), 0, 0 );
+ } else {
+ /*
+ * To check for Unicode 8 support, let's try rendering the most important advancement
+ * that the Unicode Consortium have made in years: the burrito.
+ */
+ context.fillText( String.fromCharCode( 55356, 57135 ), 0, 0 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return context.getImageData( 16, 16, 1, 1 ).data[0] !== 0;
</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">@@ -58,8 +66,9 @@
</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"> settings.supports = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- simple: browserSupportsEmoji( 'simple' ),
- flag: browserSupportsEmoji( 'flag' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ simple: browserSupportsEmoji( 'simple' ),
+ flag: browserSupportsEmoji( 'flag' ),
+ unicode8: browserSupportsEmoji( 'unicode8' )
</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"> settings.DOMReady = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> settings.DOMReady = true;
</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">- if ( ! settings.supports.simple || ! settings.supports.flag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ready = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> settings.readyCallback();
</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-11 00:23:15 UTC (rev 35605)
+++ trunk/src/wp-includes/js/wp-emoji.js 2015-11-11 02:24:40 UTC (rev 35606)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">- if ( ! settings.supports.flag && settings.supports.simple &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! settings.supports.flag && settings.supports.simple && settings.supports.unicode8 &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ! /^1f1(?:e[6-9a-f]|f[0-9a-f])-1f1(?:e[6-9a-f]|f[0-9a-f])$/.test( icon ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Initialize our emoji support, and set up listeners.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( settings ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- replaceEmoji = ! settings.supports.simple || ! settings.supports.flag;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ replaceEmoji = ! settings.supports.simple || ! settings.supports.flag || ! settings.supports.unicode8;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( settings.DOMReady ) {
</span><span class="cx" style="display: block; padding: 0 10px"> load();
</span></span></pre>
</div>
</div>
</body>
</html>