From 0653e60a5d4f66a73f3ae3f33a6718f32bf09e77 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Thu, 7 Aug 2014 19:39:10 +0000
Subject: [PATCH] Revert [29428] to avoid errors with Add Media for now.

See #29026.


git-svn-id: https://develop.svn.wordpress.org/trunk@29432 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-list-table.php |  5 +--
 src/wp-includes/js/media-grid.js              |  3 +-
 src/wp-includes/js/media-views.js             | 41 +++++++------------
 src/wp-includes/media.php                     |  4 --
 4 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php
index b23da4cee8..190b20536a 100644
--- a/src/wp-admin/includes/class-wp-list-table.php
+++ b/src/wp-admin/includes/class-wp-list-table.php
@@ -371,7 +371,7 @@ class WP_List_Table {
 		if ( empty( $this->_actions ) )
 			return;
 
-		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
+		echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select Bulk Action' ) . "</label>";
 		echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
 		echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
 
@@ -469,8 +469,7 @@ class WP_List_Table {
 
 		$m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
 ?>
-		<label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
-		<select name="m" id="filter-by-date">
+		<select name="m">
 			<option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
 <?php
 		foreach ( $months as $arc_row ) {
diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 861b115b91..9491e8d6cb 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -565,8 +565,7 @@
 	 * @augments Backbone.View
 	 */
 	media.view.BulkSelectionActionDropdown = media.View.extend({
-		tagName: 'select',
-		id:      'bulk-select-dropdown',
+		tagName:   'select',
 
 		initialize: function() {
 			media.view.Button.prototype.initialize.apply( this, arguments );
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 4d559bee6a..7b767c609f 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -5697,10 +5697,7 @@
 			var filters,
 				LibraryViewSwitcher,
 				FiltersConstructor,
-				filterByTypeLabel,
-				bulkActionsLabel,
-				filterByDateLabel,
-				searchLabel;
+				screenReaderText;
 
 			/**
 			 * @member {wp.media.view.Toolbar}
@@ -5715,32 +5712,24 @@
 			// browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
 			// which the controller can tap into and add this view?
 			if ( this.controller.activeModes.where( { id: 'grid' } ).length ) {
-
 				LibraryViewSwitcher = media.View.extend({
 					className: 'view-switch media-grid-view-switch',
 					template: media.template( 'media-library-view-switcher')
 				});
-
 				this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
 					controller: this.controller,
 					priority: -90
 				}).render() );
 
-				this.toolbar.set( 'dateFilter', new media.view.DateFilter({
-					controller: this.controller,
-					model:      this.collection.props,
-					priority: -75
-				}).render() );
-
 				this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
 					controller: this.controller,
 					priority: -70
 				}).render() );
-
-				this.toolbar.set( 'spinner', new media.view.Spinner({
-					priority: -60
-				}) );
-
+				this.toolbar.set( 'dateFilter', new media.view.DateFilter({
+					controller: this.controller,
+					model:      this.collection.props,
+					priority: -75
+				}).render() );
 			}
 
 			filters = this.options.filters;
@@ -5757,24 +5746,22 @@
 					priority:   -80
 				}).render() );
 
-				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 );
-
-				bulkActionsLabel = $( '<label class="screen-reader-text" for="bulk-select-dropdown">' + l10n.bulkActionsLabel + '</label>' );
-				this.toolbar.get( 'bulkSelection' ).$el.before( bulkActionsLabel );
+				screenReaderText = $( '<label class="screen-reader-text" for="media-attachment-filters">' + l10n.select + '</label>' );
+				this.toolbar.get( 'filters' ).$el.before( screenReaderText );
 			}
 
+			this.toolbar.set( 'spinner', new media.view.Spinner({
+				priority: -70
+			}) );
+
 			if ( this.options.search ) {
 				this.toolbar.set( 'search', new media.view.Search({
 					controller: this.controller,
 					model:      this.collection.props,
 					priority:   60
 				}).render() );
-				searchLabel = $( '<label class="screen-reader-text" for="media-search-input">' + l10n.searchMediaLabel + '</label>' );
-				this.toolbar.get( 'search' ).$el.before( searchLabel );
+				screenReaderText = $( '<label class="screen-reader-text" for="media-search-input">' + l10n.search + '</label>' );
+				this.toolbar.get( 'search' ).$el.before( screenReaderText );
 			}
 
 			if ( this.options.dragInfo ) {
diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
index 8a82beb974..4391e610ec 100644
--- a/src/wp-includes/media.php
+++ b/src/wp-includes/media.php
@@ -2937,12 +2937,8 @@ function wp_enqueue_media( $args = array() ) {
 		'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
 		'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
 		'bulkActions'            => __( 'Bulk Actions' ),
-		'bulkActionsLabel'       => __( 'Select bulk action' ),
 		'deletePermanently'      => __( 'Delete Permanently' ),
 		'apply'                  => __( 'Apply' ),
-		'filterByDate'           => __( 'Filter by date' ),
-		'filterByType'           => __( 'Filter by type' ),
-		'searchMediaLabel'       => __( 'Search Media' ),
 
 		// Library Details
 		'attachmentDetails'  => __( 'Attachment Details' ),