sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emoji: Update Twemoji to version 11.0.

Browse Source 
🦹

Props kraftbj,
Fixes #44339.



git-svn-id: https://develop.svn.wordpress.org/trunk@43377 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast 2018-06-20 04:20:32 +00:00
parent 1ebcb33c3c
commit cdd9910f01
6 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -10696,9 +10696,9 @@
"optional": true "optional": true
}, },
"twemoji": { "twemoji": {
"version": "2.5.1", "version": "11.0.0",
"resolved": "https://registry.npmjs.org/twemoji/-/twemoji-2.5.1.tgz", "resolved": "https://registry.npmjs.org/twemoji/-/twemoji-11.0.0.tgz",
"integrity": "sha1-KWZHxhY8fwR0WIccKuviXqj/6DQ=" "integrity": "sha1-fuxX0Sv9H//o1efwXaC2QipgeQ8="
}, },
"type-is": { "type-is": {
"version": "1.6.16", "version": "1.6.16",

2
package.json
View File

@ -53,7 +53,7 @@
"jquery-hoverintent": "1.8.3", "jquery-hoverintent": "1.8.3",
"jquery-ui": "github:jquery/jquery-ui#1.11.4", "jquery-ui": "github:jquery/jquery-ui#1.11.4",
"masonry-layout": "3.3.2", "masonry-layout": "3.3.2",
"twemoji": "2.5.1", "twemoji": "11.0.0",
"underscore": "1.8.3" "underscore": "1.8.3"
} }
} }

11
src/js/_enqueues/lib/emoji-loader.js
View File

@ -99,16 +99,17 @@
return ! isIdentical; return ! isIdentical;
case 'emoji': case 'emoji':
/* /*
* Emoji allows people of all gender levitate and so does WordPress. * She's the hero Emoji deserves, but not the one it needs right now.
* *
* To test for support, try to render a new emoji (woman in business suit levitating), * To test for support, try to render a new emoji (female superhero),
* then compare it to how it would look if the browser doesn't render it correctly * then compare it to how it would look if the browser doesn't render it correctly
* (person in business suit levitating + female sign). * (superhero + female sign) .
*/ */
isIdentical = emojiSetsRenderIdentically( isIdentical = emojiSetsRenderIdentically(
[55357, 56692, 8205, 9792, 65039], [55358, 56760, 9792, 65039],
[55357, 56692, 8203, 9792, 65039] [55358, 56760, 8203, 9792, 65039]
); );
return ! isIdentical; return ! isIdentical;
} }

10
src/wp-includes/formatting.php
View File

File diff suppressed because one or more lines are too long

2
src/wp-includes/general-template.php
View File

@ -2937,7 +2937,7 @@ function wp_resource_hints() {
* The path is removed in the foreach loop below. * The path is removed in the foreach loop below.
*/ */
/** This filter is documented in wp-includes/formatting.php */ /** This filter is documented in wp-includes/formatting.php */
$hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.4/svg/' ); $hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/11/svg/' );
foreach ( $hints as $relation_type => $urls ) { foreach ( $hints as $relation_type => $urls ) {
$unique_urls = array(); $unique_urls = array();

4
tests/phpunit/tests/formatting/Emoji.php
View File

@ -6,8 +6,8 @@
*/ */
class Tests_Formatting_Emoji extends WP_UnitTestCase { class Tests_Formatting_Emoji extends WP_UnitTestCase {
private $png_cdn = 'https://s.w.org/images/core/emoji/2.4/72x72/'; private $png_cdn = 'https://s.w.org/images/core/emoji/11/72x72/';
private $svn_cdn = 'https://s.w.org/images/core/emoji/2.4/svg/'; private $svn_cdn = 'https://s.w.org/images/core/emoji/11/svg/';
/** /**
* @ticket 36525 * @ticket 36525