Changeset 29432

Timestamp:

08/07/2014 07:39:10 PM (12 years ago)

Author:

wonderboymusic

Message:

Revert [29428] to avoid errors with Add Media for now.

See #29026.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-list-table.php (modified) (2 diffs)
• wp-includes/js/media-grid.js (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (6 diffs)
• wp-includes/media.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-list-table.php

@@ -372 +372 @@
                         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";
@@ -470 +470 @@
                 $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

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

@@ -566 +566 @@
          */
         media.view.BulkSelectionActionDropdown = media.View.extend({
-                tagName: 'select',
-                id:      'bulk-select-dropdown',
+                tagName:   'select',
 
                 initialize: function() {

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

@@ -5698 +5698 @@
                                 LibraryViewSwitcher,
                                 FiltersConstructor,
-                                filterByTypeLabel,
-                                bulkActionsLabel,
-                                filterByDateLabel,
-                                searchLabel;
+                                screenReaderText;
 
                         /**
@@ -5716 +5713 @@
                         // 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,
@@ -5727 +5722 @@
                                 }).render() );
 
+                                this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
+                                        controller: this.controller,
+                                        priority: -70
+                                }).render() );
                                 this.toolbar.set( 'dateFilter', new media.view.DateFilter({
                                         controller: this.controller,
@@ -5732 +5731 @@
                                         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
-                                }) );
-
                         }
 
@@ -5758 +5747 @@
                                 }).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 ) {
@@ -5774 +5761 @@
                                         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 );
                         }
 

trunk/src/wp-includes/media.php

@@ -2938 +2938 @@
                 '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