Changeset 22760

Timestamp:

11/21/2012 02:20:01 PM (12 years ago)

Author:

koopersmith

Message:

Media: Use the wp.media.string functions when generating embed strings. Embed captions now work. see #21390.

File:

• trunk/wp-admin/js/media-upload.js (modified) (4 diffs)

trunk/wp-admin/js/media-upload.js

@@ -149 +149 @@
             props = _.defaults( props || {}, {
                 align: getUserSetting( 'align', 'none' ),
-                size:  getUserSetting( 'imgsize', 'medium' )
+                size:  getUserSetting( 'imgsize', 'medium' ),
+                url:   ''
             });
 
@@ -169 +170 @@
             }
 
-            img.width  = size.width;
-            img.height = size.height;
-            img.src    = size.url;
+            img.src = props.url;
+            _.extend( img, _.pick( props, 'width', 'height', 'alt' ) );
 
             // Only assign the align class to the image if we're not printing
@@ -205 +205 @@
             // Generate the caption shortcode.
             if ( props.caption ) {
-                shortcode = {
-                    width: img.width
-                };
+                shortcode = {};
+
+                if ( img.width )
+                    shortcode.width = img.width;
 
                 if ( props.captionId )
@@ -409 +410 @@
 
             workflow.get('embed').on( 'select', function() {
-                var embed = workflow.state().toJSON(),
-                    options;
+                var embed = workflow.state().toJSON();
+
+                embed.url = embed.url || '';
 
                 if ( 'link' === embed.type ) {
-                    this.insert( wp.html.string({
-                        tag:     'a',
-                        content: embed.title || embed.url,
-                        attrs:   {
-                            href: embed.url
-                        }
-                    }) );
+                    _.defaults( embed, {
+                        title:   embed.url,
+                        linkUrl: embed.url
+                    });
+
+                    this.insert( wp.media.string.link( embed ) );
 
                 } else if ( 'image' === embed.type ) {
                     _.defaults( embed, {
+                        title:   embed.url,
+                        linkUrl: '',
                         align:   'none',
-                        url:     '',
-                        alt:     '',
-                        linkUrl: '',
                         link:    'none'
                     });
 
-                    options = {
-                        single: true,
-                        tag:    'img',
-                        attrs:  {
-                            'class': 'align' + embed.align,
-                            src:     embed.url,
-                            alt:     embed.alt
-                        }
-                    };
-
-                    if ( 'custom' === embed.link || 'file' === embed.link ) {
-                        options = {
-                            tag:     'a',
-                            content: options,
-                            attrs:   {
-                                href: 'custom' === embed.link ? embed.linkUrl : embed.url
-                            }
-                        };
-                    }
-
-                    this.insert( wp.html.string( options ) );
+                    if ( 'none' === embed.link )
+                        embed.linkUrl = '';
+                    else if ( 'file' === embed.link )
+                        embed.linkUrl = embed.url;
+
+                    this.insert( wp.media.string.image( embed ) );
                 }
             }, this );