Changeset 26882

Timestamp:

12/31/2013 03:09:34 AM (13 years ago)

Author:

azaozz

Message:

TinyMCE:

• Fix removing leftovers from broken captions.
• Better filter for line breaks and <br> tags when editing captions.

See #24067.

File:

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

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

@@ -50 +50 @@
         function getShortcode( content ) {
                 return content.replace( /<div (?:id="attachment_|class="mceTemp)[^>]*>([\s\S]+?)<\/div>/g, function( a, b ) {
+                        var out = '';
+
                         if ( b.indexOf('<img ') === -1 ) {
-                                // Broken caption. The user dragged the image out?
+                                // Broken caption. The user managed to drag the image out?
+                                // Try to return the caption text as a paragraph.
+                                out = b.match( /<dd [^>]+>([\s\S]+?)<\/dd>/i );
+
+                                if ( out && out[1] ) {
+                                        return '<p>' + out[1] + '</p>'
+                                }
+
                                 return '';
                         }
 
-                        var ret = b.replace( /<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, cap ) {
+                        out = b.replace( /<dl ([^>]+)>\s*<dt [^>]+>([\s\S]+?)<\/dt>\s*<dd [^>]+>([\s\S]*?)<\/dd>\s*<\/dl>/gi, function( a, b, c, cap ) {
                                 var id, cls, w;
 
@@ -83 +92 @@
                         });
 
-                        if ( ret.indexOf('[caption') !== 0 ) {
+                        if ( out.indexOf('[caption') !== 0 ) {
                                 // the caption html seems brocken, try to find the image that may be wrapped in a link
                                 // and may be followed by <p> with the caption text.
-                                ret = b.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );
-                        }
-
-                        return ret;
+                                out = b.replace( /[\s\S]*?((?:<a [^>]+>)?<img [^>]+>(?:<\/a>)?)(<p>[\s\S]*<\/p>)?[\s\S]*/gi, '<p>$1</p>$2' );
+                        }
+
+                        return out;
                 });
         }
@@ -162 +171 @@
                         }
 
+                        if ( caption ) {
+                                caption = caption.replace( /\r\n|\r/g, '\n' ).replace( /<\/?[a-zA-Z0-9]+( [^<>]+)?>/g, function( a ) {
+                                        // No line breaks inside HTML tags
+                                        return a.replace( /[\r\n\t]+/, ' ' );
+                                });
+
+                                // Convert remaining line breaks to <br>
+                                caption = caption.replace( /(<br[^>]*>)\s*\n\s*/g, '$1' ).replace( /\s*\n\s*/g, '<br />' );
+                        }
+
                         if ( ! imgNode ) {
                                 // New image inserted
@@ -295 +314 @@
                         if ( parent = dom.getParent( imgNode, 'dl.wp-caption' ) ) {
                                 parent = dom.select( 'dd.wp-caption-dd', parent )[0];
-                                data.caption = parent ? parent.innerHTML : '';
+
+                                if ( parent ) {
+                                        data.caption = editor.serializer.serialize( parent )
+                                                .replace( /<br[^>]*>/g, '$&\n' ).replace( /^<p>/, '' ).replace( /<\/p>$/, '' );
+                                }
                         }
                 });