<!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>[56095] trunk/src/js/_enqueues/lib/emoji-loader.js: Emoji: Pass functions as arguments in loader to account for minification and worker script.</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 { white-space: pre-line; 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/56095">56095</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/56095","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-28 17:24:36 +0000 (Wed, 28 Jun 2023)</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: Pass functions as arguments in loader to account for minification and worker script.
Amends <a href="https://core.trac.wordpress.org/changeset/56074">[56074]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/58472">#58472</a>.
Props joemcgill, westonruter, azaozz.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibemojiloaderjs">trunk/src/js/_enqueues/lib/emoji-loader.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibemojiloaderjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/emoji-loader.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/emoji-loader.js 2023-06-28 17:12:46 UTC (rev 56094)
+++ trunk/src/js/_enqueues/lib/emoji-loader.js 2023-06-28 17:24:36 UTC (rev 56095)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,10 +179,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {CanvasRenderingContext2D} context 2D Context.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {string} type Whether to test for support of "flag" or "emoji".
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {Function} emojiSetsRenderIdentically Reference to emojiSetsRenderIdentically function, needed due to minification.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {boolean} True if the browser can render emoji, false if it cannot.
</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 browserSupportsEmoji( context, type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function browserSupportsEmoji( context, type, emojiSetsRenderIdentically ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var isIdentical;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,10 +279,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param {string[]} tests Tests.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {Function} browserSupportsEmoji Reference to browserSupportsEmoji function, needed due to minification.
+ * @param {Function} emojiSetsRenderIdentically Reference to emojiSetsRenderIdentically function, needed due to minification.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {SupportTests} Support tests.
</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 testEmojiSupports( tests ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function testEmojiSupports( tests, browserSupportsEmoji, emojiSetsRenderIdentically ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var canvas;
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> typeof WorkerGlobalScope !== 'undefined' &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> var supports = {};
</span><span class="cx" style="display: block; padding: 0 10px"> tests.forEach( function ( test ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- supports[ test ] = browserSupportsEmoji( context, test );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ supports[ test ] = browserSupportsEmoji( context, test, emojiSetsRenderIdentically );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> return supports;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,20 +352,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( supportsWorkerOffloading() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * Note that this string contains the real source code for the
- * copied functions, _not_ a string representation of them. This
- * is because it's not possible to transfer a Function across
- * threads. The lack of quotes is intentional. The function names
- * are copied to variable names since minification will munge the
- * function names, thus breaking the ability for the functions to
- * refer to each other.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Note that the functions are being passed as arguments due to minification.
</ins><span class="cx" style="display: block; padding: 0 10px"> var workerScript =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'var emojiSetsRenderIdentically = ' + emojiSetsRenderIdentically + ';' +
- 'var browserSupportsEmoji = ' + browserSupportsEmoji + ';' +
- 'var testEmojiSupports = ' + testEmojiSupports + ';' +
- 'postMessage(testEmojiSupports(' + JSON.stringify(tests) + '));';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'postMessage(' +
+ testEmojiSupports.toString() +
+ '(' +
+ [
+ JSON.stringify( tests ),
+ browserSupportsEmoji.toString(),
+ emojiSetsRenderIdentically.toString()
+ ].join( ',' ) +
+ '));';
</ins><span class="cx" style="display: block; padding: 0 10px"> var blob = new Blob( [ workerScript ], {
</span><span class="cx" style="display: block; padding: 0 10px"> type: 'text/javascript'
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } catch ( e ) {}
</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">- supportTests = testEmojiSupports( tests );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ supportTests = testEmojiSupports( tests, browserSupportsEmoji, emojiSetsRenderIdentically );
</ins><span class="cx" style="display: block; padding: 0 10px"> setSessionSupportTests( supportTests );
</span><span class="cx" style="display: block; padding: 0 10px"> resolve( supportTests );
</span><span class="cx" style="display: block; padding: 0 10px"> } )
</span></span></pre>
</div>
</div>
</body>
</html>