Ticket #29026: 29026.2.patch

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

@@ -5737 +5737 @@
                                         priority: -70
                                 }).render() );
 
-                                this.toolbar.set( 'spinner', new media.view.Spinner({
-                                        priority: -60
-                                }) );
-
                         }
 
                         filters = this.options.filters;
@@ -5760 +5756 @@
                                 filterByTypeLabel = $( '<label class="screen-reader-text" for="media-attachment-filters">' + l10n.filterByType + '</label>' );
                                 this.toolbar.get( 'filters' ).$el.before( filterByTypeLabel );
 
-                                filterByDateLabel = $( '<label class="screen-reader-text" for="media-attachment-date-filters">' + l10n.filterByDate + '</label>' );
-                                this.toolbar.get( 'dateFilter' ).$el.before( filterByDateLabel );
+                                if ( this.controller.isModeActive( 'grid' ) ) {
+                                        filterByDateLabel = $( '<label class="screen-reader-text" for="media-attachment-date-filters">' + l10n.filterByDate + '</label>' );
+                                        this.toolbar.get( 'dateFilter' ).$el.before( filterByDateLabel );
 
-                                bulkActionsLabel = $( '<label class="screen-reader-text" for="bulk-select-dropdown">' + l10n.bulkActionsLabel + '</label>' );
-                                this.toolbar.get( 'bulkSelection' ).$el.before( bulkActionsLabel );
+                                        bulkActionsLabel = $( '<label class="screen-reader-text" for="bulk-select-dropdown">' + l10n.bulkActionsLabel + '</label>' );
+                                        this.toolbar.get( 'bulkSelection' ).$el.before( bulkActionsLabel );
+                                }
+
+                                this.toolbar.set( 'spinner', new media.view.Spinner({
+                                        priority: -60
+                                }) );
+
                         }
 
                         if ( this.options.search ) {