Ticket #28963: 28963.patch

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

@@ -1006 +1006 @@
         outline: none;
 }
 
-.attachments-browser .uploader-inline {
+.media-frame.mode-grid .uploader-inline {
         border: 4px dashed #bbb;
 }
 
-.attachments-browser .uploader-inline:not(.hidden) + .attachments {
-        top: 350px;
-}
-
 .attachments-browser .uploader-inline.hidden {
         display: none;
 }

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

@@ -3689 +3689 @@
                                 suggestedHeight = this.controller.state().get('suggestedHeight'),
                                 data = {};
 
+                        data.message = this.options.message;
                         data.canClose = this.options.canClose;
 
                         if ( suggestedWidth && suggestedHeight ) {
                                 data.suggestedWidth = suggestedWidth;
                                 data.suggestedHeight = suggestedHeight;
                         }
+
                         return data;
                 },
                 /**
@@ -5823 +5825 @@
                 },
 
                 updateContent: function() {
-                        var view = this;
+                        var view = this,
+                                noItemsView;
+
+                        if ( this.controller.isModeActive( 'grid' ) ) {
+                                noItemsView = view.attachmentsNoResults;
+                        } else {
+                                noItemsView = view.uploader;
+                        }
+
                         if ( ! this.collection.length ) {
                                 this.toolbar.get( 'spinner' ).show();
                                 this.collection.more().done(function() {
                                         if ( ! view.collection.length ) {
-                                                view.attachmentsNoResults.$el.removeClass( 'hidden' );
+                                                noItemsView.$el.removeClass( 'hidden' );
                                         } else {
-                                                view.attachmentsNoResults.$el.addClass( 'hidden' );
+                                                noItemsView.$el.addClass( 'hidden' );
                                         }
                                         view.toolbar.get( 'spinner' ).hide();
                                 });
                         } else {
-                                this.attachmentsNoResults.$el.addClass( 'hidden' );
+                                noItemsView.$el.addClass( 'hidden' );
                                 view.toolbar.get( 'spinner' ).hide();
                         }
                 },
@@ -5848 +5858 @@
                                 canClose:   this.controller.isModeActive( 'grid' )
                         });
 
-                        this.uploader.$el.addClass( 'hidden' );
+                        this.uploader.hide();
                         this.views.add( this.uploader );
                 },
 
@@ -5884 +5894 @@
                         this.attachmentsNoResults.$el.html( l10n.noMedia );
 
                         this.views.add( this.attachmentsNoResults );
-
-
                 },
 
                 createSidebar: function() {

src/wp-includes/media-template.php

@@ -161 +161 @@
         <script type="text/html" id="tmpl-uploader-inline">
                 <# var messageClass = data.message ? 'has-upload-message' : 'no-upload-message'; #>
                 <# if ( data.canClose ) { #>
-                <button class="close dashicons dashicons-no"><span class="screen-reader-text">Close overlay</span></button>
+                <button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close uploader' ); ?></span></button>
                 <# } #>
                 <div class="uploader-inline-content {{ messageClass }}">
                 <# if ( data.message ) { #>