<!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>[37471] trunk: Emoji: Use SVG in supported browsers</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/37471">37471</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/37471","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>2016-05-20 06:02:55 +0000 (Fri, 20 May 2016)</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 SVG in supported browsers
Use SVG images in supporting browsers, otherwise fall back to PNG images. Add the filters `emoji_svg_url` and `emoji_svg_ext`.
Introduces unit tests to check the Emoji CDN filters.
Fixes <a href="https://core.trac.wordpress.org/ticket/36525">#36525</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesjswpemojijs">trunk/src/wp-includes/js/wp-emoji.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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 2016-05-20 05:29:50 UTC (rev 37470)
+++ trunk/src/wp-includes/formatting.php 2016-05-20 06:02:55 UTC (rev 37471)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4517,12 +4517,12 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Print the inline Emoji detection script if it is not already printed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $wp_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.2.0
</ins><span class="cx" style="display: block; padding: 0 10px"> * @staticvar bool $printed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function print_emoji_detection_script() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_version;
</del><span class="cx" style="display: block; padding: 0 10px"> static $printed = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $printed ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4531,24 +4531,57 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $printed = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _print_emoji_detection_script();
+}
+
+/**
+ * Print inline Emoji dection script
+ *
+ * @ignore
+ * @since 4.6.0
+ * @access private
+ *
+ * @global string $wp_version
+ */
+function _print_emoji_detection_script() {
+ global $wp_version;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings = array(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filter the URL where emoji images are hosted.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the URL where emoji png images are hosted.
</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 string The emoji base URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string The emoji base URL for png images.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> 'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/72x72/' ),
</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">- * Filter the extension of the emoji files.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the extension of the emoji png files.
</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 string The emoji extension. Default .png.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string The emoji extension for png files. Default .png.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> 'ext' => apply_filters( 'emoji_ext', '.png' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Filter the URL where emoji SVG images are hosted.
+ *
+ * @since 4.2.0
+ *
+ * @param string The emoji base URL for svg images.
+ */
+ 'svgUrl' => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/svg/' ),
+
+ /**
+ * Filter the extension of the emoji SVG files.
+ *
+ * @since 4.2.0
+ *
+ * @param string The emoji extension for svg files. Default .svg.
+ */
+ 'svgExt' => apply_filters( 'emoji_svg_ext', '.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"> $version = 'ver=' . $wp_version;
</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 2016-05-20 05:29:50 UTC (rev 37470)
+++ trunk/src/wp-includes/js/wp-emoji.js 2016-05-20 06:02:55 UTC (rev 37471)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wpEmoji() {
</span><span class="cx" style="display: block; padding: 0 10px"> var MutationObserver = window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Compression and maintain local scope
+ document = window.document,
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Private
</span><span class="cx" style="display: block; padding: 0 10px"> twemoji, timer,
</span><span class="cx" style="display: block; padding: 0 10px"> loaded = false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +13,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ie11 = window.navigator.userAgent.indexOf( 'Trident/7.0' ) > 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Detect if the browser supports SVG.
+ *
+ * @since 4.6.0
+ *
+ * @return {Boolean} True if the browser supports svg, false if not.
+ */
+ function browserSupportsSvgAsImage() {
+ if ( !! document.implementation.hasFeature ) {
+ // Source: Modernizr
+ // https://github.com/Modernizr/Modernizr/blob/master/feature-detects/svg/asimg.js
+ return document.implementation.hasFeature( 'http://www.w3.org/TR/SVG11/feature#Image', '1.1' );
+ }
+
+ // document.implementation.hasFeature is deprecated. It can be presumed
+ // if future browsers remove it, the browser will support SVGs as images.
+ return true;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Runs when the document load event is fired, so we can do our first parse of the page.
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,8 +163,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> args = args || {};
</span><span class="cx" style="display: block; padding: 0 10px"> params = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- base: settings.baseUrl,
- ext: settings.ext,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ base: browserSupportsSvgAsImage() ? settings.svgUrl : settings.baseUrl,
+ ext: browserSupportsSvgAsImage() ? settings.svgExt : settings.ext,
</ins><span class="cx" style="display: block; padding: 0 10px"> className: args.className || 'emoji',
</span><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></pre></div>
<a id="trunktestsphpunittestsformattingEmojiphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: 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 (rev 0)
+++ trunk/tests/phpunit/tests/formatting/Emoji.php 2016-05-20 06:02:55 UTC (rev 37471)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,68 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group formatting
+ */
+class Tests_Formatting_Emoji extends WP_UnitTestCase {
+ /**
+ * @ticket 36525
+ */
+ public function test_unfiltered_emoji_cdns() {
+ $png_cdn = 'https://s.w.org/images/core/emoji/72x72/';
+ $svn_cdn = 'https://s.w.org/images/core/emoji/svg/';
+
+ $output = get_echo( '_print_emoji_detection_script' );
+
+ $this->assertContains( wp_json_encode( $png_cdn ), $output );
+ $this->assertContains( wp_json_encode( $svn_cdn ), $output );
+ }
+
+ public function _filtered_emoji_svn_cdn( $cdn = '' ) {
+ return 'https://s.wordpress.org/images/core/emoji/svg/';
+ }
+
+ /**
+ * @ticket 36525
+ */
+ public function test_filtered_emoji_svn_cdn() {
+ $png_cdn = 'https://s.w.org/images/core/emoji/72x72/';
+ $svn_cdn = 'https://s.w.org/images/core/emoji/svg/';
+
+ $filtered_svn_cdn = $this->_filtered_emoji_svn_cdn();
+
+ add_filter( 'emoji_svg_url', array( $this, '_filtered_emoji_svn_cdn' ) );
+
+ $output = get_echo( '_print_emoji_detection_script' );
+
+ $this->assertContains( wp_json_encode( $png_cdn ), $output );
+ $this->assertNotContains( wp_json_encode( $svn_cdn ), $output );
+ $this->assertContains( wp_json_encode( $filtered_svn_cdn ), $output );
+
+ remove_filter( 'emoji_svg_url', array( $this, '_filtered_emoji_svn_cdn' ) );
+ }
+
+ public function _filtered_emoji_png_cdn( $cdn = '' ) {
+ return 'https://s.wordpress.org/images/core/emoji/png_cdn/';
+ }
+
+ /**
+ * @ticket 36525
+ */
+ public function test_filtered_emoji_png_cdn() {
+ $png_cdn = 'https://s.w.org/images/core/emoji/72x72/';
+ $svn_cdn = 'https://s.w.org/images/core/emoji/svg/';
+
+ $filtered_png_cdn = $this->_filtered_emoji_png_cdn();
+
+ add_filter( 'emoji_url', array( $this, '_filtered_emoji_png_cdn' ) );
+
+ $output = get_echo( '_print_emoji_detection_script' );
+
+ $this->assertContains( wp_json_encode( $filtered_png_cdn ), $output );
+ $this->assertNotContains( wp_json_encode( $png_cdn ), $output );
+ $this->assertContains( wp_json_encode( $svn_cdn ), $output );
+
+ remove_filter( 'emoji_url', array( $this, '_filtered_emoji_png_cdn' ) );
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>