Media Modal: Restore uploader view, when no items are found.

see #28963.
Built from https://develop.svn.wordpress.org/trunk@29364


git-svn-id: http://core.svn.wordpress.org/trunk@29140 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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

@@ -1013,14 +1013,10 @@
 	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;
 }

wp-includes/css/media-views.css

@@ -1013,14 +1013,10 @@
 	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;
 }

wp-includes/js/media-views.js

@@ -3695,12 +3695,14 @@
 				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;
 		},
 		/**
@@ -5840,19 +5842,27 @@
 		},
 
 		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();
 			}
 		},
@@ -5865,7 +5875,7 @@
 				canClose:   this.controller.isModeActive( 'grid' )
 			});
 
-			this.uploader.$el.addClass( 'hidden' );
+			this.uploader.hide();
 			this.views.add( this.uploader );
 		},
 
@@ -5901,8 +5911,6 @@
 			this.attachmentsNoResults.$el.html( l10n.noMedia );
 
 			this.views.add( this.attachmentsNoResults );
-
-
 		},
 
 		createSidebar: function() {

wp-includes/media-template.php

@@ -161,7 +161,7 @@ function wp_print_media_templates() {
 	<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 ) { #>