WordPress.org

Make WordPress Core

Changeset 29432


Ignore:
Timestamp:
08/07/2014 07:39:10 PM (6 years ago)
Author:
wonderboymusic
Message:

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

See #29026.

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/class-wp-list-table.php

    r29428 r29432  
    372372            return;
    373373
    374         echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select bulk action' ) . "</label>";
     374        echo "<label for='bulk-action-selector-" . esc_attr( $which ) . "' class='screen-reader-text'>" . __( 'Select Bulk Action' ) . "</label>";
    375375        echo "<select name='action$two' id='bulk-action-selector-" . esc_attr( $which ) . "'>\n";
    376376        echo "<option value='-1' selected='selected'>" . __( 'Bulk Actions' ) . "</option>\n";
     
    470470        $m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
    471471?>
    472         <label for="filter-by-date" class="screen-reader-text"><?php _e( 'Filter by date' ); ?></label>
    473         <select name="m" id="filter-by-date">
     472        <select name="m">
    474473            <option<?php selected( $m, 0 ); ?> value="0"><?php _e( 'All dates' ); ?></option>
    475474<?php
  • trunk/src/wp-includes/js/media-grid.js

    r29428 r29432  
    566566     */
    567567    media.view.BulkSelectionActionDropdown = media.View.extend({
    568         tagName: 'select',
    569         id:      'bulk-select-dropdown',
     568        tagName:   'select',
    570569
    571570        initialize: function() {
  • trunk/src/wp-includes/js/media-views.js

    r29428 r29432  
    56985698                LibraryViewSwitcher,
    56995699                FiltersConstructor,
    5700                 filterByTypeLabel,
    5701                 bulkActionsLabel,
    5702                 filterByDateLabel,
    5703                 searchLabel;
     5700                screenReaderText;
    57045701
    57055702            /**
     
    57165713            // which the controller can tap into and add this view?
    57175714            if ( this.controller.activeModes.where( { id: 'grid' } ).length ) {
    5718 
    57195715                LibraryViewSwitcher = media.View.extend({
    57205716                    className: 'view-switch media-grid-view-switch',
    57215717                    template: media.template( 'media-library-view-switcher')
    57225718                });
    5723 
    57245719                this.toolbar.set( 'libraryViewSwitcher', new LibraryViewSwitcher({
    57255720                    controller: this.controller,
     
    57275722                }).render() );
    57285723
     5724                this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
     5725                    controller: this.controller,
     5726                    priority: -70
     5727                }).render() );
    57295728                this.toolbar.set( 'dateFilter', new media.view.DateFilter({
    57305729                    controller: this.controller,
     
    57325731                    priority: -75
    57335732                }).render() );
    5734 
    5735                 this.toolbar.set( 'bulkSelection', new media.view.BulkSelection({
    5736                     controller: this.controller,
    5737                     priority: -70
    5738                 }).render() );
    5739 
    5740                 this.toolbar.set( 'spinner', new media.view.Spinner({
    5741                     priority: -60
    5742                 }) );
    5743 
    57445733            }
    57455734
     
    57585747                }).render() );
    57595748
    5760                 filterByTypeLabel = $( '<label class="screen-reader-text" for="media-attachment-filters">' + l10n.filterByType + '</label>' );
    5761                 this.toolbar.get( 'filters' ).$el.before( filterByTypeLabel );
    5762 
    5763                 filterByDateLabel = $( '<label class="screen-reader-text" for="media-attachment-date-filters">' + l10n.filterByDate + '</label>' );
    5764                 this.toolbar.get( 'dateFilter' ).$el.before( filterByDateLabel );
    5765 
    5766                 bulkActionsLabel = $( '<label class="screen-reader-text" for="bulk-select-dropdown">' + l10n.bulkActionsLabel + '</label>' );
    5767                 this.toolbar.get( 'bulkSelection' ).$el.before( bulkActionsLabel );
    5768             }
     5749                screenReaderText = $( '<label class="screen-reader-text" for="media-attachment-filters">' + l10n.select + '</label>' );
     5750                this.toolbar.get( 'filters' ).$el.before( screenReaderText );
     5751            }
     5752
     5753            this.toolbar.set( 'spinner', new media.view.Spinner({
     5754                priority: -70
     5755            }) );
    57695756
    57705757            if ( this.options.search ) {
     
    57745761                    priority:   60
    57755762                }).render() );
    5776                 searchLabel = $( '<label class="screen-reader-text" for="media-search-input">' + l10n.searchMediaLabel + '</label>' );
    5777                 this.toolbar.get( 'search' ).$el.before( searchLabel );
     5763                screenReaderText = $( '<label class="screen-reader-text" for="media-search-input">' + l10n.search + '</label>' );
     5764                this.toolbar.get( 'search' ).$el.before( screenReaderText );
    57785765            }
    57795766
  • trunk/src/wp-includes/media.php

    r29430 r29432  
    29382938        'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
    29392939        'bulkActions'            => __( 'Bulk Actions' ),
    2940         'bulkActionsLabel'       => __( 'Select bulk action' ),
    29412940        'deletePermanently'      => __( 'Delete Permanently' ),
    29422941        'apply'                  => __( 'Apply' ),
    2943         'filterByDate'           => __( 'Filter by date' ),
    2944         'filterByType'           => __( 'Filter by type' ),
    2945         'searchMediaLabel'       => __( 'Search Media' ),
    29462942
    29472943        // Library Details
Note: See TracChangeset for help on using the changeset viewer.