WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Emoji: update Twemoji to 1.3.1. Props iseulde. See #31242. 

Built from https://develop.svn.wordpress.org/trunk@31766


git-svn-id: http://core.svn.wordpress.org/trunk@31746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-03-13 17:20:26 +00:00
parent 805c530cf0
commit 69c08b1b65
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/js/twemoji.js
View File

@ -326,7 +326,7 @@ var twemoji = (function (
var var
allText = grabAllTextNodes(node, []), allText = grabAllTextNodes(node, []),
length = allText.length, length = allText.length,
modified = false, modified,
fragment, fragment,
subnode, subnode,
text, text,
@ -339,6 +339,7 @@ var twemoji = (function (
variant, variant,
src; src;
while (length--) { while (length--) {
modified = false;
fragment = document.createDocumentFragment(); fragment = document.createDocumentFragment();
subnode = allText[length]; subnode = allText[length];
text = subnode.nodeValue; text = subnode.nodeValue;
@ -385,7 +386,6 @@ var twemoji = (function (
// replace the text node only, leave intact // replace the text node only, leave intact
// anything else surrounding such text // anything else surrounding such text
subnode.parentNode.replaceChild(fragment, subnode); subnode.parentNode.replaceChild(fragment, subnode);
modified = false;
} }
} }
return node; return node;
@ -519,4 +519,4 @@ var twemoji = (function (
return r.join(sep || '-'); return r.join(sep || '-');
} }
}()); }());

2
wp-includes/js/twemoji.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/script-loader.php
View File

@ -424,7 +424,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'media-audiovideo', "/wp-includes/js/media/audio-video$suffix.js", array( 'media-editor' ), false, 1 ); $scripts->add( 'media-audiovideo', "/wp-includes/js/media/audio-video$suffix.js", array( 'media-editor' ), false, 1 );
$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 ); $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
$scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), '1.3.0', 1 ); $scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), '1.3.1', 1 );
$scripts->add( 'emoji', "/wp-includes/js/wp-emoji$suffix.js", array( 'twemoji' ), false, 1 ); $scripts->add( 'emoji', "/wp-includes/js/wp-emoji$suffix.js", array( 'twemoji' ), false, 1 );
did_action( 'init' ) && $scripts->localize( 'emoji', '_wpemojiSettings', array( did_action( 'init' ) && $scripts->localize( 'emoji', '_wpemojiSettings', array(
/** /**