Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 07:22:01 +01:00
Code Issues Projects Releases Wiki Activity

Emoji: fix few typos. See #31242.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@31787


git-svn-id: http://core.svn.wordpress.org/trunk@31767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-03-15 23:29:26 +00:00
parent a7fd4a3774
commit c18ef513a0
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/js/tinymce/plugins/wpemoji/plugin.js
View File

@ -23,7 +23,7 @@
typing = event.type === 'keydown';
} );
editor.on( 'input', function( event ) {
editor.on( 'input', function() {
if ( typing ) {
return;
}
@ -52,7 +52,7 @@
if ( twemoji.test( node.textContent || node.innerText ) ) {
replaceEmoji( node );
// In IE all content in the editor is left selected aftrer wp.emoji.parse()...
// In IE all content in the editor is left selected after wp.emoji.parse()...
// Collapse the selection to the beginning.
if ( tinymce.Env.ie && tinymce.Env.ie < 9 && event.load && node && node.nodeName === 'BODY' ) {
selection.collapse( true );
@ -60,7 +60,7 @@
}
} );
// Convert Twemoji compatible pasted emoji repacement images into our format.
// Convert Twemoji compatible pasted emoji replacement images into our format.
editor.on( 'PastePostProcess', function( event ) {
if ( twemoji ) {
tinymce.each( editor.dom.$( 'img.emoji', event.node ), function( image ) {

4
wp-includes/js/wp-emoji.js
View File

@ -88,8 +88,8 @@
if ( type === 'flag' ) {
/*
* This works because the image will be one of three things:
* - Two empty squares, if the browser doen't render emoji
* - Two squares with 'G' and 'B' in them, if the browser doen't render flag emoji
* - Two empty squares, if the browser doesn't render emoji
* - Two squares with 'G' and 'B' in them, if the browser doesn't render flag emoji
* - The British flag
*
* The first two will encode to small images (1-2KB data URLs), the third will encode

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta1-31786';
$wp_version = '4.2-beta1-31787';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.