Ticket #47146: 47146.diff

src/js/media/models/attachments.js

@@ -293 +293 @@
                 this.reset( [], { silent: true } );
                 this.observe( attachments );
 
+                // For the search results.
+                this.trigger( 'attachments:mirror:done', this );
                 return this;
         },
         /**
@@ -332 +334 @@
                         if ( this === attachments.mirroring ) {
                                 deferred.resolveWith( this );
                         }
+
+                        // For the search results.
+                        attachments.trigger( 'attachments:more:done', this );
                 });
 
                 return deferred.promise();

src/js/media/models/query.js

@@ -287 +287 @@
                                 query = _.find( queries, function( query ) {
                                         return _.isEqual( query.args, args );
                                 });
+                                // window.console.log( 'models query search cached', query );
                         } else {
                                 queries = [];
                         }
@@ -298 +299 @@
                                         args:  args
                                 } ) );
                                 queries.push( query );
+                                // window.console.log( 'models query search request', query );
                         }
 
                         return query;

src/js/media/views/attachments/browser.js

@@ -83 +83 @@
                 }
 
                 this.collection.on( 'add remove reset', this.updateContent, this );
+
+                // Non-cached attachments query.
+                this.collection.on( 'attachments:more:done', this.queryDone, this );
+                // Cached attachments query.
+                this.collection.on( 'attachments:mirror:done', this.queryDone, this );
         },
 
+        queryDone: function() {
+                var count;
+
+                if ( this.collection.mirroring.args.s ) {
+                        count = this.collection.length;
+                        window.console.log( 'browser queryDone', this.collection );
+                        window.console.log( 'search results: ' + count );
+
+                        if ( 0 === count ) {
+                                wp.a11y.speak( l10n.noMediaTryNewSearch );
+                                return;
+                        }
+
+                        wp.a11y.speak( l10n.mediaFound.replace( '%d', count ) );
+                }
+        },
+
         editSelection: function( modal ) {
                 // When editing a selection, move focus to the "Return to library" button.
                 modal.$( '.media-button-backToLibrary' ).focus();

src/js/media/views/search.js

@@ -22 +22 @@
         },
 
         events: {
-                'input':  'search',
-                'keyup':  'search'
+                'input': 'search'
         },
 
         /**
@@ -40 +39 @@
                 } else {
                         this.model.unset('search');
                 }
-        }, 300 )
+        }, 500 )
 });
 
 module.exports = Search;

src/wp-includes/media.php

@@ -3812 +3812 @@
                 'filterByType'                => __( 'Filter by type' ),
                 'searchMediaLabel'            => __( 'Search Media' ),
                 'searchMediaPlaceholder'      => __( 'Search media items...' ), // placeholder (no ellipsis)
-                'noMedia'                     => __( 'No media files found.' ),
+                'noMedia'                     => __( 'No media items found.' ),
+                'mediaFound'                  => __( 'Number of media items found: %d' ),
+                'noMediaTryNewSearch'         => __( 'No media items found. Try a different search.' ),
 
                 // Library Details
                 'attachmentDetails'           => __( 'Attachment Details' ),

src/wp-includes/script-loader.php

@@ -1507 +1507 @@
 
         // To enqueue media-views or media-editor, call wp_enqueue_media().
         // Both rely on numerous settings, styles, and templates to operate correctly.
-        $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request' ), false, 1 );
+        $scripts->add( 'media-views', "/wp-includes/js/media-views$suffix.js", array( 'utils', 'media-models', 'wp-plupload', 'jquery-ui-sortable', 'wp-mediaelement', 'wp-api-request', 'wp-a11y' ), false, 1 );
         $scripts->add( 'media-editor', "/wp-includes/js/media-editor$suffix.js", array( 'shortcode', 'media-views' ), false, 1 );
         $scripts->add( 'media-audiovideo', "/wp-includes/js/media-audiovideo$suffix.js", array( 'media-editor' ), false, 1 );
         $scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'jquery', 'media-views', 'media-audiovideo' ), false, 1 );