Changeset 29364

Timestamp:

08/02/2014 08:46:36 PM (11 years ago)

Author:

ocean90

Message:

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

see #28963.

Location:

trunk/src/wp-includes

Files:

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

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

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

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

@@ -3696 +3696 @@
                 data = {};
 
+            data.message = this.options.message;
             data.canClose = this.options.canClose;
 
@@ -3702 +3703 @@
                 data.suggestedHeight = suggestedHeight;
             }
+
             return data;
         },
@@ -5841 +5843 @@
 
         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();
             }
@@ -5866 +5876 @@
             });
 
-            this.uploader.$el.addClass( 'hidden' );
+            this.uploader.hide();
             this.views.add( this.uploader );
         },
@@ -5902 +5912 @@
 
             this.views.add( this.attachmentsNoResults );
-
-
         },
 

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

@@ -162 +162 @@
         <# 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 }}">