Ticket #42055: 42055.diff

src/wp-admin/includes/theme.php

@@ -632 +632 @@
         ?>
         <script type="text/html" id="tmpl-customize-themes-details-view">
                 <div class="theme-backdrop"></div>
-                <div class="theme-wrap wp-clearfix">
+                <div class="theme-wrap wp-clearfix" role="document">
                         <div class="theme-header">
                                 <button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
                                 <button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>

src/wp-admin/js/theme.js

@@ -683 +683 @@
 
                 // Set initial focus on the primary action control.
                 _.delay( function() {
-                        $( '.theme-wrap a.button-primary:visible' ).focus();
+                        $( '.theme-overlay' ).focus();
                 }, 100 );
 
                 // Constrain tabbing within the modal.
@@ -1603 +1603 @@
                 this.listenTo( this.collection, 'query:fail', function() {
                         $( 'body' ).removeClass( 'loading-content' );
                         $( '.theme-browser' ).find( 'div.error' ).remove();
-                        $( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + l10n.error + '</p><p><button class="button try-again">' + l10n.tryAgain + '</button></p></div>' ); 
-                        $( '.theme-browser .error .try-again' ).on( 'click', function( e ) { 
-                                e.preventDefault(); 
-                                $( 'input.wp-filter-search' ).trigger( 'input' ); 
+                        $( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + l10n.error + '</p><p><button class="button try-again">' + l10n.tryAgain + '</button></p></div>' );
+                        $( '.theme-browser .error .try-again' ).on( 'click', function( e ) {
+                                e.preventDefault();
+                                $( 'input.wp-filter-search' ).trigger( 'input' );
                         } );
                 });
 

src/wp-admin/themes.php

@@ -301 +301 @@
 <?php endforeach; ?>
         </div>
 </div>
-<div class="theme-overlay"></div>
+<div class="theme-overlay" tabindex="0" role="dialog" aria-label="<?php esc_attr_e( 'Theme Details' ); ?>"></div>
 
 <p class="no-themes"><?php _e( 'No themes found. Try a different search query.' ); ?></p>
 
@@ -431 +431 @@
 
 <script id="tmpl-theme-single" type="text/template">
         <div class="theme-backdrop"></div>
-        <div class="theme-wrap wp-clearfix">
+        <div class="theme-wrap wp-clearfix" role="document">
                 <div class="theme-header">
                         <button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
                         <button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>