Changeset 31946

Timestamp:

03/31/2015 11:34:23 PM (12 years ago)

Author:

azaozz

Message:

TinyMCE emoji: fix caret position after replacing emoji in Chrome on Windows 8.
See #31627.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js (modified) (3 diffs)

trunk/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js

@@ -31 +31 @@
                 }
 
+                // Test if the node text contains emoji char(s) and replace.
+                function parseNode( node ) {
+                        var selection, bookmark;
+
+                        if ( node && twemoji.test( node.textContent || node.innerText ) ) {
+                                if ( env.webkit ) {
+                                        selection = editor.selection;
+                                        bookmark = selection.getBookmark();
+                                }
+
+                                replaceEmoji( node );
+
+                                if ( env.webkit ) {
+                                        selection.moveToBookmark( bookmark );
+                                }
+                        }
+                }
+
                 if ( isWin8 ) {
                         // Windows 8+ emoji can be "typed" with the onscreen keyboard.
@@ -36 +54 @@
                         // Thankfully it sets keyCode 231 when the onscreen keyboard inserts any emoji.
                         editor.on( 'keyup', function( event ) {
-                                var node;
-
                                 if ( event.keyCode === 231 ) {
-                                        node = editor.selection.getNode();
-
-                                        if ( twemoji.test( node.textContent || node.innerText ) ) {
-                                                replaceEmoji( node );
-                                        }
+                                        parseNode( editor.selection.getNode() );
                                 }
                         } );
@@ -59 +71 @@
                                 }
 
-                                var bookmark,
-                                        selection = editor.selection,
-                                        node = selection.getNode();
-
-                                if ( twemoji.test( node.textContent || node.innerText ) ) {
-                                        if ( env.webkit ) {
-                                                bookmark = selection.getBookmark();
-                                        }
-
-                                        replaceEmoji( node );
-
-                                        if ( env.webkit ) {
-                                                selection.moveToBookmark( bookmark );
-                                        }
-                                }
+                                parseNode( editor.selection.getNode() );
                         });
                 }