Ticket #21471: 21471.2.diff

wp-includes/js/admin-bar.js

@@ -66 +66 @@
                         e.preventDefault();
                         $('html, body').animate({ scrollTop: 0 }, 'fast');
                 });
+                
+                $('.screen-reader-shortcut').keydown(function (e) {
+                        var thisHref = $(this).attr('href');
+                        if ( 13 == e.which && thisHref.substring(0, 1) == "#" ) {
+                                setTimeout(function () {
+                                        $(thisHref).focus();
+                                }, 100);
+                        }
+                });
 
         });
 } else {

wp-includes/class-wp-admin-bar.php

@@ -349 +349 @@
                 ?>
                 <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
                         <a class="screen-reader-text screen-reader-shortcut" href="#wp-toolbar" tabindex="1"><?php _e('Skip to toolbar'); ?></a>
-                        <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Top navigation toolbar.'); ?>">
+                        <div class="quicklinks" id="wp-toolbar" role="navigation" aria-label="<?php esc_attr_e('Top navigation toolbar.'); ?>" tabindex="0">
                                 <?php foreach ( $root->children as $group ) {
                                         $this->_render_group( $group );
                                 } ?>

wp-admin/admin-header.php

@@ -126 +126 @@
 
 ?>
 
-<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>">
+<div id="wpbody-content" aria-label="<?php esc_attr_e('Main content'); ?>" tabindex="0">
 <?php
 
 $current_screen->render_screen_meta();