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

Emoji: fix few typos. See #31242. 

git-svn-id: https://develop.svn.wordpress.org/trunk@31787 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2015-03-15 23:28:04 +00:00
parent 005ff9a8c8
commit f078bc93aa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
typing = event.type === 'keydown'; typing = event.type === 'keydown';
} ); } );
editor.on( 'input', function( event ) { editor.on( 'input', function() {
if ( typing ) { if ( typing ) {
return; return;
} }
@ -52,7 +52,7 @@
if ( twemoji.test( node.textContent || node.innerText ) ) { if ( twemoji.test( node.textContent || node.innerText ) ) {
replaceEmoji( node ); 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. // Collapse the selection to the beginning.
if ( tinymce.Env.ie && tinymce.Env.ie < 9 && event.load && node && node.nodeName === 'BODY' ) { if ( tinymce.Env.ie && tinymce.Env.ie < 9 && event.load && node && node.nodeName === 'BODY' ) {
selection.collapse( true ); 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 ) { editor.on( 'PastePostProcess', function( event ) {
if ( twemoji ) { if ( twemoji ) {
tinymce.each( editor.dom.$( 'img.emoji', event.node ), function( image ) { tinymce.each( editor.dom.$( 'img.emoji', event.node ), function( image ) {

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

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