Changeset 31994

Timestamp:

04/03/2015 02:31:11 AM (10 years ago)

Author:

azaozz

Message:

Accessibility improvements for Themes screen: fix keyboard events and callbacks for the Search field, increase trigger timeout a bit, improve Esc. key handling.
Props joedolson, adamsilverstein, afercia, DrewAPicture. Fixes #26600.

Location:

trunk/src

Files:

• wp-admin/css/themes.css (modified) (1 diff)
• wp-admin/js/theme.js (modified) (12 diffs)
• wp-admin/theme-install.php (modified) (3 diffs)
• wp-admin/themes.php (modified) (4 diffs)
• wp-admin/update.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/css/themes.css

@@ -1139 +1139 @@
     font-style: normal;
     margin: 0;
-    padding: 100px 0 0;
+    padding: 0;
     text-align: center;
     display: none;

trunk/src/wp-admin/js/theme.js

@@ -80 +80 @@
         // Render and append
         this.view.render();
-        this.$el.find( '.themes' ).remove();
-        this.$el.append( this.view.el ).addClass( 'rendered' );
+        this.$el.empty().append( this.view.el ).addClass( 'rendered' );
         this.$el.append( '<br class="clear"/>' );
     },
@@ -158 +157 @@
         if ( this.terms === '' ) {
             this.reset( themes.data.themes );
+            $( 'body' ).removeClass( 'no-results' );
         }
 
@@ -832 +832 @@
     count: $( '.wp-core-ui .theme-count' ),
 
+    // The live themes count
+    liveThemeCount: 0,
+
     initialize: function( options ) {
         var self = this;
@@ -855 +858 @@
             if ( _.isNumber( count ) ) {
                 self.count.text( count );
+                self.announceSearchResults( count );
             } else {
                 self.count.text( self.collection.length );
+                self.announceSearchResults( self.collection.length );
             }
         });
@@ -927 +932 @@
 
         // Display a live theme count for the collection
-        this.count.text( this.collection.count ? this.collection.count : this.collection.length );
+        this.liveThemeCount = this.collection.count ? this.collection.count : this.collection.length;
+        this.count.text( this.liveThemeCount );
+
+        this.announceSearchResults( this.liveThemeCount );
     },
 
@@ -1079 +1087 @@
 
         }
+    },
+
+    // Dispatch audible search results feedback message
+    announceSearchResults: function( count ) {
+        if ( 0 === count ) {
+            wp.a11y.speak( l10n.noThemesFound );
+        } else {
+            wp.a11y.speak( l10n.themesFound.replace( '%d', count ) );
+        }
     }
 });
@@ -1092 +1109 @@
     attributes: {
         placeholder: l10n.searchPlaceholder,
-        type: 'search'
+        type: 'search',
+        'aria-describedby': 'live-search-desc'
     },
 
     events: {
-        'input':  'search',
-        'keyup':  'search',
-        'change': 'search',
-        'search': 'search',
-        'blur':   'pushState'
+        'input': 'search',
+        'keyup': 'search',
+        'blur': 'pushState'
     },
 
@@ -1113 +1129 @@
     },
 
-    // Runs a search on the theme collection.
     search: function( event ) {
-        var options = {};
-
         // Clear on escape.
         if ( event.type === 'keyup' && event.which === 27 ) {
@@ -1122 +1135 @@
         }
 
-        // Lose input focus when pressing enter
-        if ( event.which === 13 ) {
-            this.$el.trigger( 'blur' );
-        }
+        /**
+         * Since doSearch is debounced, it will only run when user input comes to a rest
+         */
+        this.doSearch( event );
+    },
+
+    // Runs a search on the theme collection.
+    doSearch: _.debounce( function( event ) {
+        var options = {};
 
         this.collection.doSearch( event.target.value );
@@ -1142 +1160 @@
             themes.router.navigate( themes.router.baseUrl( '' ) );
         }
-    },
+    }, 500 ),
 
     pushState: function( event ) {
@@ -1253 +1271 @@
 
     events: {
+        'input': 'search',
         'keyup': 'search'
     },
@@ -1306 +1325 @@
         // Set route
         themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + value ), { replace: true } );
-    }, 300 )
+    }, 500 )
 });
 

trunk/src/wp-admin/theme-install.php

@@ -45 +45 @@
     'l10n' => array(
         'addNew' => __( 'Add New Theme' ),
-        'search'  => __( 'Search Themes' ),
+        'search' => __( 'Search Themes' ),
         'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
         'upload' => __( 'Upload Theme' ),
         'back'   => __( 'Back' ),
-        'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' )
+        'error'  => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
+        'themesFound'   => __( 'Number of Themes found: %d' ),
+        'noThemesFound' => __( 'No themes found. Try a different search.' ),
     ),
     'installedThemes' => array_keys( $installed_themes ),
@@ -71 +73 @@
 $help_overview =
     '<p>' . sprintf(__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'), 'https://wordpress.org/themes/') . '</p>' .
-    '<p>' . __('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter. Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.') . '</p>' .
+    '<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
+    '<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
     '<p>' . __('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your <code>/wp-content/themes</code> directory.') . '</p>';
 
@@ -167 +170 @@
         </div>
     </div>
-    <div class="theme-browser content-filterable" aria-live="polite">
-        <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
-    </div>
+    <div class="theme-browser content-filterable"></div>
     <div class="theme-install-overlay wp-full-overlay expanded"></div>
+
+    <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
     <span class="spinner"></span>
 

trunk/src/wp-admin/themes.php

@@ -48 +48 @@
         '<li>' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '</li>' .
         '<li>' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '</li></ul>' .
-        '<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>';
+        '<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>' .
+        '<p>' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>';
 
     get_current_screen()->add_help_tab( array(
@@ -108 +109 @@
     ),
     'l10n' => array(
-        'addNew' => __( 'Add New Theme' ),
-        'search'  => __( 'Search Installed Themes' ),
+        'addNew'            => __( 'Add New Theme' ),
+        'search'            => __( 'Search Installed Themes' ),
         'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
+        'themesFound'       => __( 'Number of Themes found: %d' ),
+        'noThemesFound'     => __( 'No themes found. Try a different search.' ),
     ),
 ) );
@@ -199 +202 @@
 ?>
 
-<div class="theme-browser" aria-live="polite">
+<div class="theme-browser">
     <div class="themes">
 
@@ -256 +259 @@
     <br class="clear" />
     </div>
-    <p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 </div>
 <div class="theme-overlay"></div>
+
+<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 
 <?php

trunk/src/wp-admin/update.php

@@ -202 +202 @@
             wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
-        include_once( ABSPATH . 'wp-admin/includes/theme-install.php' ); //for themes_api..
+        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
 
         check_admin_referer( 'install-theme_' . $theme );

trunk/src/wp-includes/script-loader.php

@@ -501 +501 @@
         $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable', 'jquery-ui-droppable' ), false, 1 );
 
-        $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone' ), false, 1 );
+        $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'wp-backbone', 'wp-a11y' ), false, 1 );
 
         $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 );