Changeset 22159

Timestamp:

10/10/2012 09:55:47 AM (14 years ago)

Author:

koopersmith

Message:

Show filenames for non-image attachments in the new media modal.

Also passes all attachment model attributes to the attachment view template by default (instead of selecting specific values).

see #21390, #21836.

Location:

trunk/wp-includes

Files:

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

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

@@ -257 +257 @@
         background: #eee;
         cursor: pointer;
+        color: #464646;
 
         -webkit-user-select: none;
@@ -307 +308 @@
         -o-transform:      translate( -50%, -50% );
         transform:         translate( -50%, -50% );
+}
+
+.attachment .filename {
+        margin-top: 140px;
+        padding: 0 10px;
+        text-align: center;
+        font-weight: bold;
 }
 

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

@@ -407 +407 @@
                 render: function() {
                         var attachment = this.model.toJSON(),
-                                options = {
-                                        icon:        attachment.icon,
-                                        uploading:   attachment.uploading,
-                                        orientation: attachment.orientation || 'landscape',
-                                        type:        attachment.type,
-                                        subtype:     attachment.subtype,
-                                        buttons:     this.buttons
-                                };
-
-
-                        if ( 'image' === attachment.type )
+                                options = _.defaults( this.model.toJSON(), {
+                                        orientation: 'landscape',
+                                        uploading:   false,
+                                        type:        ''
+                                });
+
+                        options.buttons = this.buttons;
+
+                        if ( 'image' === options.type )
                                 _.extend( options, this.crop() );
 
                         this.$el.html( this.template( options ) );
 
-                        if ( attachment.uploading )
+                        if ( options.uploading )
                                 this.$bar = this.$('.media-progress-bar div');
                         else

trunk/wp-includes/media.php

@@ -1334 +1334 @@
                                         style="top:<%- top %>px; left:<%- left %>px;" />
                                 </div>
+                        <% } else if ( uploading ) { %>
+                                <div class="media-progress-bar"><div></div></div>
                         <% } else { %>
                                 <img src="<%- icon %>" class="icon" draggable="false" />
+                                <div class="filename"><%- filename %></div>
                         <% } %>
 
-                        <% if ( uploading ) { %>
-                                <div class="media-progress-bar"><div></div></div>
-                        <% } %>
+
 
                         <% if ( buttons.close ) { %>