Changeset 27786

Timestamp:

03/27/2014 06:06:13 PM (11 years ago)

Author:

nacin

Message:

Remove the TinyMCE image toolbar when the image is deleted via the keyboard.

props gcorne.
fixes #27527.

File:

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

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

@@ -1 +1 @@
 /* global tinymce */
 tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
+    var toolbarActive = false;
+
     function parseShortcode( content ) {
         return content.replace( /(?:<p>)?\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\](?:<\/p>)?/g, function( a, b, c ) {
@@ -103 +105 @@
 
             if ( out.indexOf('[caption') !== 0 ) {
-                // the caption html seems brocken, try to find the image that may be wrapped in a link
+                // the caption html seems broken, try to find the image that may be wrapped in a link
                 // and may be followed by <p> with the caption text.
                 out = b.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );
@@ -340 +342 @@
             editor.dom.remove( node );
         }
+        removeToolbar();
     }
 
@@ -372 +375 @@
             left: rectangle.x
         });
+
+        toolbarActive = true;
     }
 
@@ -382 +387 @@
 
         editor.dom.setAttrib( editor.dom.select( 'img[data-wp-imgselect]' ), 'data-wp-imgselect', null );
+
+        toolbarActive = false;
     }
 
@@ -754 +761 @@
         var node, wrap, P, spacer,
             selection = editor.selection,
+            keyCode = event.keyCode,
             dom = editor.dom;
 
-        if ( event.keyCode === tinymce.util.VK.ENTER ) {
+        if ( keyCode === tinymce.util.VK.ENTER ) {
             // When pressing Enter inside a caption move the caret to a new parapraph under it
             node = selection.getNode();
@@ -783 +791 @@
                 selection.setCursorLocation( P, 0 );
             }
-        } else if ( event.keyCode === tinymce.util.VK.DELETE || event.keyCode === tinymce.util.VK.BACKSPACE ) {
+        } else if ( keyCode === tinymce.util.VK.DELETE || keyCode === tinymce.util.VK.BACKSPACE ) {
             node = selection.getNode();
 
@@ -797 +805 @@
                 return false;
             }
+
+            removeToolbar();
+        }
+
+        // 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 ) {
+                return;
+            }
+
+            removeToolbar();
         }
     });
@@ -829 +849 @@
                 if ( dom.hasClass( node, 'remove' ) ) {
                     removeImage( image );
-                    removeToolbar();
                 } else if ( dom.hasClass( node, 'edit' ) ) {
                     editImage( image );