sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@21784 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Daryl Koopersmith 2012-09-07 21:27:07 +00:00
parent b489c2b242
commit c7eca8e2d5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/js/media-views.js
View File

@ -527,12 +527,14 @@
render: function() {
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.
if ( attachment.sizes && attachment.sizes.medium ) {
@ -614,7 +616,11 @@
options.count = this.collection.length;
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 ) );
return this;

3
wp-includes/media.php
View File

@ -1576,6 +1576,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
'mime' => $attachment->post_mime_type,
'type' => $type,
'subtype' => $subtype,
'icon' => wp_mime_type_icon( $attachment->post_mime_type ),
);
if ( $meta && 'image' === $type ) {
@ -1646,7 +1647,7 @@ function wp_print_media_templates( $attachment ) {
</script>
<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 %>" />
<% } %>