Changeset 22554

Timestamp:

11/13/2012 12:32:04 AM (13 years ago)

Author:

koopersmith

Message:

Media: Properly insert caption shortcodes for attachments.

File:

• trunk/wp-includes/js/mce-view.js (modified) (3 diffs)

trunk/wp-includes/js/mce-view.js

@@ -456 +456 @@
 
     wp.media.string.image = function( attachment, props ) {
-        var classes, img, options, size;
+        var classes, img, options, size, shortcode, html;
 
         props = _.defaults( props || {}, {
@@ -482 +482 @@
         img.src    = size.url;
 
-        // Update `img` classes.
-        if ( props.align )
+        // Only assign the align class to the image if we're not printing
+        // a caption, since the alignment is sent to the shortcode.
+        if ( props.align && ! attachment.caption )
             classes.push( 'align' + props.align );
 
@@ -515 +516 @@
         }
 
-        return wp.html.string( options );
+        html = wp.html.string( options );
+
+        // Generate the caption shortcode.
+        if ( attachment.caption ) {
+            shortcode = {
+                id:    'attachment_' + attachment.id,
+                width: img.width
+            };
+
+            if ( props.align )
+                shortcode.align = 'align' + props.align;
+
+            html = wp.shortcode.string({
+                tag:     'caption',
+                attrs:   shortcode,
+                content: html + ' ' + attachment.caption
+            });
+        }
+
+        return html;
     };