Ticket #28272: 28272.2.diff

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

@@ -808 +808 @@
                 editor.undoManager.add();
         }
 
+        function selectImageParent( event ) {
+                var node = editor.selection.getNode(),
+                  parent = node.parentNode;
+
+                if ( node.nodeName === 'IMG' ) {
+
+                        // Prevent dragging images out of the caption elements
+                        if ( event.type == 'dragstart' && editor.dom.getParent( node, '.wp-caption' ) ) {
+                                event.preventDefault();
+                        }
+
+                        // Select anchor nodes without text content
+                        if ( parent && parent.nodeName === 'A' && ! hasTextContent( parent ) ) {
+                                editor.selection.select( parent );
+                        }
+
+                        // Select anchor nodes without text content, which wrap an inner node like strong or em
+                        if ( parent && parent.nodeName !== 'A' && parent.parentNode && parent.parentNode.nodeName === 'A' && ! hasTextContent( parent.parentNode ) ) {
+                                editor.selection.select( parent.parentNode );
+                        }
+                }
+        }
+
         editor.on( 'init', function() {
                 var dom = editor.dom,
                         captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions';
@@ -1038 +1061 @@
                         }
                 });
 
-                dom.bind( editor.getDoc(), 'dragstart', function( event ) {
-                        var node = editor.selection.getNode();
-
-                        // Prevent dragging images out of the caption elements
-                        if ( node.nodeName === 'IMG' && dom.getParent( node, '.wp-caption' ) ) {
-                                event.preventDefault();
-                        }
-                });
-
                 // Prevent IE11 from making dl.wp-caption resizable
                 if ( tinymce.Env.ie && tinymce.Env.ie > 10 ) {
                         // The 'mscontrolselect' event is supported only in IE11+
@@ -1220 +1234 @@
                 }
         });
 
+        editor.on( 'dragstart', function( event ) {
+                selectImageParent( event );
+        });
+
+        editor.on( 'contextmenu', function( event ) {
+                selectImageParent( event );
+        });
+
+        editor.on( 'keydown', function( event ) {
+                if ( tinymce.util.VK.metaKeyPressed( event ) ) {
+                        selectImageParent( event );
+                }
+        });
+
         return {
                 _do_shcode: parseShortcode,
                 _get_shcode: getShortcode