<!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>[31750] trunk: Emoji: Instead of having custom hooks for Ajax callbacks, use MutationObserver to re-parse any changed elements in the DOM.</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/31750">31750</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/31750","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-03-12 12:51:06 +0000 (Thu, 12 Mar 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: Instead of having custom hooks for Ajax callbacks, use MutationObserver to re-parse any changed elements in the DOM.
Props iseulde
See <a href="https://core.trac.wordpress.org/ticket/31242">#31242</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
<li><a href="#trunksrcwpadminjsinlineeditpostjs">trunk/src/wp-admin/js/inline-edit-post.js</a></li>
<li><a href="#trunksrcwpadminjsinlineedittaxjs">trunk/src/wp-admin/js/inline-edit-tax.js</a></li>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpadminjstagsjs">trunk/src/wp-admin/js/tags.js</a></li>
<li><a href="#trunksrcwpincludesjstinymcepluginswpemojipluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js</a></li>
<li><a href="#trunksrcwpincludesjswpemojijs">trunk/src/wp-includes/js/wp-emoji.js</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/Gruntfile.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,6 +302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/js/hoverIntent.js',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/js/json2.js',
</span><span class="cx" style="display: block; padding: 0 10px"> '!wp-includes/js/tw-sack.js',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!wp-includes/js/twemoji.js',
</ins><span class="cx" style="display: block; padding: 0 10px"> '!**/*.min.js'
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove once other JSHint errors are resolved
</span></span></pre></div>
<a id="trunksrcwpadminjsinlineeditpostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/inline-edit-post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/inline-edit-post.js 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-admin/js/inline-edit-post.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 !== r.indexOf( '<tr' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $(inlineEditPost.what+id).siblings('tr.hidden').addBack().remove();
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edit-'+id).before(r).remove();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.emoji.parse( $( inlineEditPost.what + id ).get( 0 ) );
</del><span class="cx" style="display: block; padding: 0 10px"> $(inlineEditPost.what+id).hide().fadeIn();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> r = r.replace( /<.[^<>]*?>/g, '' );
</span></span></pre></div>
<a id="trunksrcwpadminjsinlineedittaxjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/inline-edit-tax.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/inline-edit-tax.js 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-admin/js/inline-edit-tax.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,8 +117,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the value in the Parent dropdown.
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#parent' ).find( 'option[value=' + option_value + ']' ).text( row.find( '.row-title' ).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">- wp.emoji.parse( row.get( 0 ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> row.hide().fadeIn();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edit-'+id+' .inline-edit-save .error').html(r).show();
</span></span></pre></div>
<a id="trunksrcwpadminjspostjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/post.js 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-admin/js/post.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,8 +741,6 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.emoji.parse( box.get( 0 ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> b.html(revert_b);
</span><span class="cx" style="display: block; padding: 0 10px"> real_slug.val(new_slug);
</span><span class="cx" style="display: block; padding: 0 10px"> $('#view-post-btn').show();
</span></span></pre></div>
<a id="trunksrcwpadminjstagsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/tags.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/tags.js 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-admin/js/tags.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,8 +49,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.tags' ).prepend( res.responses[0].supplemental.parents ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.emoji.parse( $( '.tags' ).get( 0 ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $('.tags .no-items').remove();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( form.find('select#parent') ) {
</span></span></pre></div>
<a id="trunksrcwpincludesjstinymcepluginswpemojipluginjs"></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/tinymce/plugins/wpemoji/plugin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> typing = event.type === 'keydown';
</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">- editor.on( 'input setcontent', function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editor.on( 'input setcontent', function( event ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> var selection, node, bookmark, imgs;
</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 ( typing ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( typing && event.type === 'input' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-includes/js/wp-emoji.js 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,34 +1,13 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* global _wpemojiSettings, twemoji */
</del><span class="cx" style="display: block; padding: 0 10px"> window.wp = window.wp || {};
</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() {
- var emoji;
-
- wp.emoji = emoji = {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+( function( window, wp, twemoji, settings ) {
+ var emoji = {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The CDN URL for where emoji files are hosted.
- *
- * @since 4.2.0
- *
- * @var string
- */
- baseUrl: '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72',
-
- /**
- * The extension of the hosted emoji files.
- *
- * @since 4.2.0
- *
- * @var string
- */
- ext: '.png',
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Flag to determine if we should parse all emoji characters into Twemoji images.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var Boolean
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> parseAllEmoji: false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var Boolean
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> parseEmoji: false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +25,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var bool
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var Boolean
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> parseFlags: false,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,17 +35,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> init: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( typeof _wpemojiSettings !== 'undefined' ) {
- emoji.baseUrl = _wpemojiSettings.baseUrl || emoji.baseUrl;
- emoji.ext = _wpemojiSettings.ext || emoji.ext;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> emoji.parseAllEmoji = ! emoji.browserSupportsEmoji();
</span><span class="cx" style="display: block; padding: 0 10px"> emoji.parseFlags = ! emoji.browserSupportsFlagEmoji();
</span><span class="cx" style="display: block; padding: 0 10px"> emoji.parseEmoji = emoji.parseAllEmoji || emoji.parseFlags;
</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 ( ! emoji.parseEmoji ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( window.addEventListener ) {
+ window.addEventListener( 'load', emoji.load, false );
+ } else if ( window.attachEvent ) {
+ window.attachEvent( 'onload', emoji.load );
</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">@@ -76,6 +52,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> load: function() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( MutationObserver ) {
+ new MutationObserver( function( mutationRecords ) {
+ var i = mutationRecords.length,
+ ii,
+ node;
+
+ while ( i-- ) {
+ ii = mutationRecords[ i ].addedNodes.length;
+
+ while ( ii-- ) {
+ node = mutationRecords[ i ].addedNodes[ ii ];
+
+ if ( node.nodeType === 3 ) {
+ node = node.parentNode;
+ }
+
+ if ( node.nodeType === 1 ) {
+ emoji.parse( node );
+ }
+ }
+ }
+ } )
+
+ .observe( document.body, {
+ childList: true,
+ subtree: true
+ } );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> emoji.parse( document.body );
</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">@@ -84,22 +89,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return {bool} True if the browser can render emoji, false if it cannot.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return {Boolean} True if the browser can render emoji, false if it cannot.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> browserSupportsEmoji: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var context, smile;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var canvas = document.createElement( 'canvas' ),
+ context = canvas.getContext && canvas.getContext( '2d' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! document.createElement( 'canvas' ).getContext ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! context.fillText ) {
+ return false;
</ins><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">- context = document.createElement( 'canvas' ).getContext( '2d' );
- if ( typeof context.fillText != 'function' ) {
- return;
- }
-
- smile = String.fromCharCode( 55357 ) + String.fromCharCode( 56835 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Chrome OS X added native emoji rendering in M41. Unfortunately,
</span><span class="cx" style="display: block; padding: 0 10px"> * it doesn't work when the font is bolder than 500 weight. So, we
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- context.fillText( smile, 0, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ context.fillText( String.fromCharCode( 55357, 56835 ), 0, 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,29 +116,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * made of two characters, so some browsers (notably, Firefox OS X) don't support them.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return {bool} True if the browser renders flag characters as a flag glyph, false if it does not.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @return {Boolean} True if the browser renders flag characters as a flag glyph, false if it does not.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> browserSupportsFlagEmoji: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var context, flag, canvas;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var canvas = document.createElement( 'canvas' ),
+ context = canvas.getContext && canvas.getContext( '2d' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- canvas = document.createElement( 'canvas' );
-
- if ( ! canvas.getContext ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! context.fillText ) {
+ return false;
</ins><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">- context = canvas.getContext( '2d' );
-
- if ( typeof context.fillText != 'function' ) {
- return;
- }
-
- flag = String.fromCharCode(55356) + String.fromCharCode(56812); // [G]
- flag += String.fromCharCode(55356) + String.fromCharCode(56807); // [B]
-
</del><span class="cx" style="display: block; padding: 0 10px"> context.textBaseline = 'top';
</span><span class="cx" style="display: block; padding: 0 10px"> context.font = '32px Arial';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- context.fillText( flag, 0, 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ context.fillText( String.fromCharCode( 55356, 56812, 55356, 56807 ), 0, 0 );
</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"> * This works because the image will be one of three things:
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,24 +141,23 @@
</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><span class="cx" style="display: block; padding: 0 10px"> return canvas.toDataURL().length > 3000;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Given a DOM node, parse any emoji characters into Twemoji images.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Given an element or string, parse any emoji characters into Twemoji images.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {Element} element The DOM node to parse.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param {HTMLElement|String} object The element or string to parse.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parse: function( element ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parse: function( object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! emoji.parseEmoji ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return object;
</ins><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">- return twemoji.parse( element, {
- base: emoji.baseUrl,
- ext: emoji.ext,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return twemoji.parse( object, {
+ base: settings.baseUrl,
+ ext: settings.ext,
</ins><span class="cx" style="display: block; padding: 0 10px"> callback: function( icon, options ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Ignore some standard characters that TinyMCE recommends in its character map.
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( icon ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,11 +182,7 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( window.addEventListener ) {
- window.addEventListener( 'load', emoji.load, false );
- } else if ( window.attachEvent ) {
- window.attachEvent( 'onload', emoji.load );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ emoji.init();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- emoji.init();
-})();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.emoji = emoji;
+} )( window, window.wp, window.twemoji, window._wpemojiSettings );
</ins></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2015-03-12 08:52:42 UTC (rev 31749)
+++ trunk/src/wp-includes/script-loader.php 2015-03-12 12:51:06 UTC (rev 31750)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,7 +447,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->enqueue( 'emoji' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response', 'emoji' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'admin-tags', "/wp-admin/js/tags$suffix.js", array( 'jquery', 'wp-ajax-response' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'admin-tags', 'tagsl10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'noPerm' => __('You do not have permission to do that.'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'broken' => __('An unidentified error has occurred.')
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'tagDelimiter' => _x( ',', 'tag delimiter' ),
</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">- $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box', 'emoji' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array( 'suggest', 'wp-lists', 'postbox', 'tags-box' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ok' => __('OK'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'cancel' => __('Cancel'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -522,7 +522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone' ), false, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest', 'emoji' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => __('Error while saving the changes.'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'ntdeltitle' => __('Remove From Bulk Edit'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comma' => trim( _x( ',', 'tag delimiter' ) ),
</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">- $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery', 'emoji' ), false, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), false, 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> did_action( 'init' ) && $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'error' => __('Error while saving the changes.')
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span></span></pre>
</div>
</div>
</body>
</html>