Changeset 38796

Timestamp:

10/14/16 21:37:41 (9 months ago)

Author:

azaozz

Message:

TinyMCE:

• Prevent applying Indent and Outdent while an image with a caption is selected. It doesn't do anything and breaks the caption elements.
• Keep all of the text when a caption <dl> was somehow changed.

Fixes #38313.

File:

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

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

@@ -182 +182 @@
             var out = '';
 
-            if ( dl.indexOf('<img ') === -1 ) {
-                // Broken caption. The user managed to drag the image out?
-                // Try to return the caption text as a paragraph.
-                out = dl.match( /<dd [^>]+>([\s\S]+?)<\/dd>/i );
-
-                if ( out && out[1] ) {
-                    return '<p>' + out[1] + '</p>';
-                }
-
-                return '';
+            if ( dl.indexOf('<img ') === -1 || dl.indexOf('</p>') !== -1 ) {
+                // Broken caption. The user managed to drag the image out or type in the wrapper div?
+                // Remove the <dl>, <dd> and <dt> and return the remaining text.
+                return dl.replace( /<d[ldt]( [^>]+)?>/g, '' ).replace( /<\/d[ldt]>/g, '' );
             }
 
@@ -897 +891 @@
             dom = editor.dom;
 
-        if ( cmd === 'mceInsertContent' ) {
+        if ( cmd === 'mceInsertContent' || cmd === 'Indent' || cmd === 'Outdent' ) {
             node = editor.selection.getNode();
             captionParent = dom.getParent( node, 'div.mceTemp' );
 
             if ( captionParent ) {
-                if ( pasteInCaption ) {
-                    pasteInCaption = false;
-                    // We are in the caption element, and in 'paste' context,
-                    // and the pasted HTML was cleaned up on 'pastePostProcess' above.
-                    // Let it be pasted in the caption.
-                    return;
-                }
-
-                // The paste is somewhere else in the caption DL element.
-                // Prevent pasting in there as it will break the caption.
-                // Make new paragraph under the caption DL and move the caret there.
-                p = dom.create( 'p' );
-                dom.insertAfter( p, captionParent );
-                editor.selection.setCursorLocation( p, 0 );
-                editor.nodeChanged();
+                if ( cmd === 'mceInsertContent' ) {
+                    if ( pasteInCaption ) {
+                        pasteInCaption = false;
+                        // We are in the caption element, and in 'paste' context,
+                        // and the pasted HTML was cleaned up on 'pastePostProcess' above.
+                        // Let it be pasted in the caption.
+                        return;
+                    }
+
+                    // The paste is somewhere else in the caption DL element.
+                    // Prevent pasting in there as it will break the caption.
+                    // Make new paragraph under the caption DL and move the caret there.
+                    p = dom.create( 'p' );
+                    dom.insertAfter( p, captionParent );
+                    editor.selection.setCursorLocation( p, 0 );
+                    editor.nodeChanged();
+                } else {
+                    // Clicking Indent or Outdent while an image with a caption is selected breaks the caption.
+                    // See #38313.
+                    event.preventDefault();
+                    event.stopImmediatePropagation();
+                    return false;
+                }
             }
         } else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' || cmd === 'wpAlignNone' ) {