Changeset 22543

Timestamp:

11/11/2012 05:16:41 AM (12 years ago)

Author:

koopersmith

Message:

Media: Ensure variables in the attachment details template have defined defaults.

• Adds styling to the upload progress bar in the attachment details template.
• Defines the filename attribute when Plupload creates the client-side Attachment model.

fixes #22410, see #21390.

Location:

trunk/wp-includes

Files:

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

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

@@ -934 +934 @@
 }
 
+.uploading .attachment-info .thumbnail {
+    width: 120px;
+    height: 80px;
+    box-shadow: inset 0 0 15px rgba( 0, 0, 0, 0.1 );
+}
+
+.uploading .attachment-info .media-progress-bar {
+    margin-top: 32px;
+}
+
 .attachment-info .thumbnail:after {
     content: '';

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

@@ -1955 +1955 @@
             var attachment = this.model.toJSON(),
                 options = _.defaults( this.model.toJSON(), {
-                    orientation: 'landscape',
-                    uploading:   false,
-                    type:        '',
-                    subtype:     '',
-                    icon:        '',
-                    filename:    '',
-                    caption:     '',
-                    title:       ''
+                    orientation:   'landscape',
+                    uploading:     false,
+                    type:          '',
+                    subtype:       '',
+                    icon:          '',
+                    filename:      '',
+                    caption:       '',
+                    title:         '',
+                    dateFormatted: '',
+                    width:         '',
+                    height:        '',
+                    compat:        false,
+                    alt:           ''
                 });
 
@@ -1973 +1978 @@
             this.$el.html( this.template( options ) );
 
+            this.$el.toggleClass( 'uploading', options.uploading );
             if ( options.uploading )
                 this.$bar = this.$('.media-progress-bar div');

trunk/wp-includes/js/plupload/wp-plupload.js

@@ -148 +148 @@
                     file:      file,
                     uploading: true,
-                    date:      new Date()
+                    date:      new Date(),
+                    filename:  file.name
                 }, _.pick( file, 'loaded', 'size', 'percent' ) );
 

trunk/wp-includes/media.php

@@ -1455 +1455 @@
                 <div class="filename">{{ filename }}</div>
                 <div class="uploaded">{{ dateFormatted }}</div>
-                <# if ( 'image' === type ) { #>
+                <# if ( 'image' === type && ! uploading ) { #>
                     <div class="dimensions">{{ width }} &times; {{ height }}</div>
                 <# } #>