Ticket #27527: 27527-01.patch

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

@@ -102 +102 @@
                         });
 
                         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' );
                         }
@@ -339 +339 @@
                 } else {
                         editor.dom.remove( node );
                 }
+                removeToolbar();
         }
 
         function addToolbar( node ) {
@@ -755 +756 @@
                         selection = editor.selection,
                         dom = editor.dom;
 
+                node = selection.getNode();
+
                 if ( event.keyCode === tinymce.util.VK.ENTER ) {
                         // When pressing Enter inside a caption move the caret to a new parapraph under it
-                        node = selection.getNode();
                         wrap = dom.getParent( node, 'div.mceTemp' );
 
                         if ( wrap ) {
@@ -783 +785 @@
                                 selection.setCursorLocation( P, 0 );
                         }
                 } else if ( event.keyCode === tinymce.util.VK.DELETE || event.keyCode === tinymce.util.VK.BACKSPACE ) {
-                        node = selection.getNode();
 
                         if ( node.nodeName === 'DIV' && dom.hasClass( node, 'mceTemp' ) ) {
                                 wrap = node;
@@ -797 +798 @@
                                 return false;
                         }
                 }
+
+                // Key presses will replace the image so we need to remove the toolbar
+                if ( dom.getAttrib( node, 'data-wp-imgselect' ) ) {
+                        removeToolbar();
+                }
         });
 
         editor.on( 'mousedown', function( event ) {
@@ -828 +834 @@
 
                                 if ( dom.hasClass( node, 'remove' ) ) {
                                         removeImage( image );
-                                        removeToolbar();
                                 } else if ( dom.hasClass( node, 'edit' ) ) {
                                         editImage( image );
                                 }