<!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>[31948] trunk/src/wp-includes/js: 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/31948">31948</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/31948","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-04-01 02:38:25 +0000 (Wed, 01 Apr 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:
- Enhance twemoji.js to support passing of additional attributes for the replacement images.
- Use that to add the needed attributes when replacing emoji inside the editor.
Fixes <a href="https://core.trac.wordpress.org/ticket/31627">#31627</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjstinymcepluginswpemojipluginjs">trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js</a></li>
<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="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-04-01 02:21:15 UTC (rev 31947)
+++ trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js 2015-04-01 02:38:25 UTC (rev 31948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,12 +22,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> image.className = 'emoji';
</span><span class="cx" style="display: block; padding: 0 10px"> image.setAttribute( 'data-mce-resize', 'false' );
</span><span class="cx" style="display: block; padding: 0 10px"> image.setAttribute( 'data-mce-placeholder', '1' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- image.setAttribute( 'data-wp-emoji', image.alt );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ image.setAttribute( 'data-wp-emoji', '1' );
</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"> function replaceEmoji( node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp.emoji.parse( node, { className: 'emoji _inserted-emoji' } );
- tinymce.each( editor.dom.$( 'img._inserted-emoji', node ), setImgAttr );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var imgAttr = {
+ 'data-mce-resize': 'false',
+ 'data-mce-placeholder': '1',
+ 'data-wp-emoji': '1'
+ };
+
+ wp.emoji.parse( node, { imgAttr: imgAttr } );
</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"> // Test if the node text contains emoji char(s) and replace.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +107,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> editor.on( 'postprocess', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( event.content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- event.content = event.content.replace( /<img[^>]+data-wp-emoji="([^"]+)"[^>]*>/g, '$1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ event.content = event.content.replace( /<img[^>]+data-wp-emoji="[^>]+>/g, function( img ) {
+ var alt = img.match( /alt="([^"]+)"/ );
+
+ if ( alt && alt[1] ) {
+ return alt[1];
+ }
+
+ return img;
+ });
</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="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-04-01 02:21:15 UTC (rev 31947)
+++ trunk/src/wp-includes/js/twemoji.js 2015-04-01 02:38:25 UTC (rev 31948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,7 +337,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> alt,
</span><span class="cx" style="display: block; padding: 0 10px"> icon,
</span><span class="cx" style="display: block; padding: 0 10px"> variant,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- src;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ src,
+ attr;
</ins><span class="cx" style="display: block; padding: 0 10px"> while (length--) {
</span><span class="cx" style="display: block; padding: 0 10px"> modified = false;
</span><span class="cx" style="display: block; padding: 0 10px"> fragment = document.createDocumentFragment();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,6 +364,14 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Set additional image attributes.
+ if ( options.imgAttr ) {
+ for ( attr in options.imgAttr ) {
+ img.setAttribute( attr, options.imgAttr[attr] );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> img.onerror = twemoji.onerror;
</span><span class="cx" style="display: block; padding: 0 10px"> img.className = options.className;
</span><span class="cx" style="display: block; padding: 0 10px"> img.setAttribute('draggable', 'false');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function parseString(str, options) {
</span><span class="cx" style="display: block; padding: 0 10px"> return replace(str, function (match, icon, variant) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var src;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var src, attr, attributes = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> // verify the variant is not the FE0E one
</span><span class="cx" style="display: block; padding: 0 10px"> // this variant means "emoji as text" and should not
</span><span class="cx" style="display: block; padding: 0 10px"> // require any action/replacement
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,6 +427,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> variant
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if (src) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set additional image attributes.
+ if ( options.imgAttr ) {
+ for ( attr in options.imgAttr ) {
+ if ( ! /draggable|class|alt|src/i.test( attr ) ) {
+ attributes += ' '.concat( attr, '="', options.imgAttr[attr], '"' );
+ }
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // recycle the match string replacing the emoji
</span><span class="cx" style="display: block; padding: 0 10px"> // with its image counter part
</span><span class="cx" style="display: block; padding: 0 10px"> match = '<img '.concat(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,6 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'src="',
</span><span class="cx" style="display: block; padding: 0 10px"> src,
</span><span class="cx" style="display: block; padding: 0 10px"> '"',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ attributes,
</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">@@ -483,7 +502,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,
+ imgAttr: how.imgAttr
</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">@@ -519,4 +539,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return r.join(sep || '-');
</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">-}());
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}());
</ins></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-04-01 02:21:15 UTC (rev 31947)
+++ trunk/src/wp-includes/js/wp-emoji.js 2015-04-01 02:38:25 UTC (rev 31948)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,12 +100,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return object;
</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">- var className = ( args && args.className ) || 'emoji';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ args = args || {};
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return twemoji.parse( object, {
</span><span class="cx" style="display: block; padding: 0 10px"> base: settings.baseUrl,
</span><span class="cx" style="display: block; padding: 0 10px"> ext: settings.ext,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- className: className,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ className: args.className || 'emoji',
+ imgAttr: args.imgAttr,
</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></pre>
</div>
</div>
</body>
</html>