Changeset 35261

Timestamp:

10/18/2015 11:04:33 AM (11 years ago)

Author:

iseulde

Message:

TinyMCE: Drag and drop link with image

Make sure images don't loose their link after drag and drop.

Fixes #28272.

File:

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

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

@@ -964 +964 @@
                         if ( node.nodeName === 'IMG' ) {
                                 wrap = editor.dom.getParent( node, '.mceTemp' );
+
+                                if ( ! wrap && node.parentNode.nodeName === 'A' && ! hasTextContent( node.parentNode ) ) {
+                                        wrap = node.parentNode;
+                                }
                         }
                 } );
 
                 editor.on( 'drop', function( event ) {
-                        var rng;
-
-                        if ( wrap && ( rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint( event.clientX, event.clientY, editor.getDoc() ) ) ) {
+                        var dom = editor.dom,
+                                rng = tinymce.dom.RangeUtils.getCaretRangeFromPoint( event.clientX, event.clientY, editor.getDoc() );
+
+                        // Don't allow anything to be dropped in a captioned image.
+                        if ( dom.getParent( rng.startContainer, '.mceTemp' ) ) {
                                 event.preventDefault();
-
-                                if ( ! editor.dom.getParent( rng.startContainer, '.mceTemp' ) ) {
-                                        editor.undoManager.transact( function() {
-                                                editor.selection.setRng( rng );
-                                                editor.selection.setNode( wrap );
-                                                editor.dom.remove( wrap );
-                                        } );
-                                }
+                        } else if ( wrap ) {
+                                event.preventDefault();
+
+                                editor.undoManager.transact( function() {
+                                        editor.selection.setRng( rng );
+                                        editor.selection.setNode( wrap );
+                                        dom.remove( wrap );
+                                } );
                         }