Changeset 22170

Timestamp:

10/10/2012 09:54:21 PM (14 years ago)

Author:

koopersmith

Message:

Correctly insert non-image attachments as links.

• Adds wp.media.string.link( attachment ) for printing attachment links.
• Adds the link attribute to Attachment models that corresponds to the link to the attachment post.

see #21390, #21836.

Location:

trunk

Files:

• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/js/mce-view.js (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)

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

@@ -109 +109 @@
 
                         workflow.on( 'update:insert', function( selection ) {
-                                this.insert( '\n' + selection.map( function( attachment ) {
-                                        return wp.media.string.image( attachment );
-                                }).join('\n\n') + '\n' );
+                                this.insert( selection.map( function( attachment ) {
+                                        if ( 'image' === attachment.get('type') )
+                                                return '\n' + wp.media.string.image( attachment ) + '\n';
+                                        else
+                                                return wp.media.string.link( attachment ) + ' ';
+                                }).join('') );
                         }, this );
 

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

@@ -372 +372 @@
 
         wp.media.string = {};
+
+        wp.media.string.link = function( attachment ) {
+                var linkTo  = getUserSetting( 'urlbutton', 'post' ),
+                        options = {
+                                tag:     'a',
+                                content: attachment.get('title') || attachment.get('filename'),
+                                attrs:   {
+                                        rel: 'attachment wp-att-' + attachment.id
+                                }
+                        };
+
+                // Attachments can be linked to attachment post pages or to the direct
+                // URL. `none` is not a valid option.
+                options.attrs.href = ( linkTo === 'file' ) ? attachment.get('url') : attachment.get('link');
+
+                return wp.html.string( options );
+        };
+
         wp.media.string.image = function( attachment, props ) {
                 var classes, img, options, size;

trunk/wp-includes/media.php

@@ -1247 +1247 @@
                 'filename'    => basename( $attachment->guid ),
                 'url'         => $attachment_url,
+                'link'        => get_attachment_link( $attachment->ID ),
                 'alt'         => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
                 'author'      => $attachment->post_author,