Changeset 29535

Timestamp:

08/19/2014 03:26:14 AM (10 years ago)

Author:

azaozz

Message:

TinyMCE wpView: ignore more keys when the caret is around a view. Part props avryl, fixes #29115.

File:

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

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

@@ -354 +354 @@
     });
 
+    // Excludes arrow keys, delete, backspace, enter, space bar.
+    function isSpecialKey( key ) {
+        return ( ( key <= 47 && key !== VK.SPACEBAR && key !== VK.ENTER && key !== VK.DELETE && key !== VK.BACKSPACE && ( key < 37 || key > 40 ) ) ||
+            key === 144 || key === 145 || // Num Lock, Scroll Lock
+            ( key >= 91 && key <= 93 ) || // Windows keys
+            ( key >= 112 && key <= 123 ) ); // F keys
+    }
+
     // (De)select views when arrow keys are used to navigate the content of the editor.
     editor.on( 'keydown', function( event ) {
@@ -411 +419 @@
                     setViewCursor( false, view );
                 }
+
                 event.preventDefault();
             // Ignore keys that don't insert anything.
-            } else if ( ( key > 47 || VK.SPACEBAR || key === VK.ENTER || key === VK.DELETE || key === VK.BACKSPACE ) && key !== 144 && key !== 145 ) {
+            } else if ( ! isSpecialKey( key ) ) {
                 removeView( selected );
 
@@ -473 +482 @@
             }
 
+            if ( isSpecialKey( key ) ) {
+                // ignore
+                return;
+            }
+
             if ( ( cursorAfter && key === VK.UP ) || ( cursorBefore && key === VK.BACKSPACE ) ) {
                 if ( view.previousSibling ) {