Changeset 29438

Timestamp:

08/07/2014 09:00:45 PM (12 years ago)

Author:

wonderboymusic

Message:

Media Grid:

• Use a media.view.Label instance in the toolbar for the screen reader text for the "all" dropdown.
• Adjust the spinner's priority.

Fixes #29026.

Location:

trunk/src/wp-includes

Files:

• js/media-views.js (modified) (3 diffs)
• media.php (modified) (1 diff)

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

@@ -5744 +5744 @@
                         }
 
+                        this.toolbar.set( 'spinner', new media.view.Spinner({
+                                priority: -60
+                        }) );
+
                         filters = this.options.filters;
                         if ( 'uploaded' === filters ) {
@@ -5752 +5756 @@
 
                         if ( FiltersConstructor ) {
+                                // "FiltersConstructor" will return a <select>, need to render
+                                // screen reader text before
+                                this.toolbar.set( 'filtersLabel', new media.view.Label({
+                                        value: l10n.filterByType,
+                                        attributes: {
+                                                'for':  'media-attachment-filters'
+                                        },
+                                        priority:   -80
+                                }).render() );
                                 this.toolbar.set( 'filters', new FiltersConstructor({
                                         controller: this.controller,
@@ -5757 +5770 @@
                                         priority:   -80
                                 }).render() );
-
-                                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 ) {

trunk/src/wp-includes/media.php

@@ -2942 +2942 @@
                 'apply'                  => __( 'Apply' ),
                 'filterByDate'           => __( 'Filter by date' ),
+                'filterByType'           => __( 'Filter by type' ),
                 'searchMediaLabel'       => __( 'Search Media' ),