Changeset 21784

Timestamp:

09/07/2012 09:27:07 PM (14 years ago)

Author:

koopersmith

Message:

Use icons for non-image attachments in the new media modal. see #21836, #21390, #21808.

Location:

trunk/wp-includes

Files:

• js/media-views.js (modified) (2 diffs)
• media.php (modified) (2 diffs)

trunk/wp-includes/js/media-views.js

@@ -528 +528 @@
                         var attachment = this.model.toJSON(),
                                 options = {
+                                        thumbnail:   'image' === attachment.type ? attachment.url : attachment.icon,
+                                        uploading:   attachment.uploading,
                                         orientation: attachment.orientation || 'landscape',
-                                        thumbnail:   attachment.url || '',
-                                        uploading:   attachment.uploading
+                                        type:        attachment.type,
+                                        subtype:     attachment.subtype
                                 };
 
-                        // Use the medium size if possible. If the medium size
+                        // Use the medium image size if possible. If the medium size
                         // doesn't exist, then the attachment is too small.
                         // In that case, use the attachment itself.
@@ -615 +617 @@
                         first = this.collection.first();
                         sizes = first.get('sizes');
-                        options.thumbnail = ( sizes && sizes.thumbnail ) ? sizes.thumbnail.url : first.get('url');
+
+                        if ( 'image' === first.get('type') )
+                                options.thumbnail = ( sizes && sizes.thumbnail ) ? sizes.thumbnail.url : first.get('url');
+                        else
+                                options.thumbnail =  first.get('icon');
 
                         this.$el.html( this.template( options ) );

trunk/wp-includes/media.php

@@ -1577 +1577 @@
                 'type'        => $type,
                 'subtype'     => $subtype,
+                'icon'        => wp_mime_type_icon( $attachment->post_mime_type ),
         );
 
@@ -1647 +1648 @@
 
         <script type="text/html" id="tmpl-attachment">
-                <div class="attachment-thumbnail <%- orientation %>">
+                <div class="attachment-thumbnail type-<%- type %> subtype-<%- subtype %> <%- orientation %>">
                         <% if ( thumbnail ) { %>
                                 <img src="<%- thumbnail %>" />