Changeset 29541

Timestamp:

08/19/2014 07:13:08 PM (12 years ago)

Author:

azaozz

Message:

TinyMCE: fix the keycode check when removing the Edit/Delete toolbar from images on keydown, see #28705

File:

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

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

@@ -919 +919 @@
                         selection = editor.selection,
                         keyCode = event.keyCode,
-                        dom = editor.dom;
-
-                if ( keyCode === tinymce.util.VK.ENTER ) {
+                        dom = editor.dom,
+                        VK = tinymce.util.VK;
+
+                if ( keyCode === VK.ENTER ) {
                         // When pressing Enter inside a caption move the caret to a new parapraph under it
                         node = selection.getNode();
@@ -948 +949 @@
                                 selection.setCursorLocation( P, 0 );
                         }
-                } else if ( keyCode === tinymce.util.VK.DELETE || keyCode === tinymce.util.VK.BACKSPACE ) {
+                } else if ( keyCode === VK.DELETE || keyCode === VK.BACKSPACE ) {
                         node = selection.getNode();
 
@@ -966 +967 @@
                 }
 
-                // Key presses will replace the image so we need to remove the toolbar
+                // Most key presses will replace the image so we need to remove the toolbar
                 if ( toolbarActive ) {
-                        if ( event.ctrlKey || event.metaKey || event.altKey ||
-                                ( keyCode < 48 && keyCode > 90 ) || keyCode > 186 ) {
+                        if ( event.ctrlKey || event.metaKey || event.altKey || ( keyCode < 48 && keyCode !== VK.SPACEBAR ) ) {
                                 return;
                         }