Changeset 29609

Timestamp:

08/25/2014 10:44:32 PM (10 years ago)

Author:

azaozz

Message:

Media modal: fix the progress bar in the attachment thumbnail. Props gcorne, fixes #29367

Location:

trunk/src/wp-includes

Files:

• js/media-views.js (modified) (3 diffs)
• media-template.php (modified) (1 diff)

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

@@ -4681 +4681 @@
             if ( options.rerenderOnModelChange ) {
                 this.model.on( 'change', this.render, this );
+            } else {
+                this.model.on( 'change:percent', this.progress, this );
             }
             this.model.on( 'change:title', this._syncTitle, this );
@@ -4686 +4688 @@
             this.model.on( 'change:artist', this._syncArtist, this );
             this.model.on( 'change:album', this._syncAlbum, this );
-            this.model.on( 'change:percent', this.progress, this );
 
             // Update the selection.
@@ -4754 +4755 @@
             }
 
+            if ( options.uploading && ! options.percent ) {
+                options.percent = 0;
+            }
+
             this.views.detach();
             this.$el.html( this.template( options ) );
 
             this.$el.toggleClass( 'uploading', options.uploading );
+
             if ( options.uploading ) {
                 this.$bar = this.$('.media-progress-bar div');

trunk/src/wp-includes/media-template.php

@@ -429 +429 @@
             <div class="thumbnail">
                 <# if ( data.uploading ) { #>
-                    <div class="media-progress-bar"><div>
+                    <div class="media-progress-bar"><div style="width: {{ data.percent }}%"></div></div>
                 <# } else if ( 'image' === data.type && data.sizes ) { #>
                     <div class="centered">