Ticket #26639: 26639.2.diff

src/wp-admin/js/common.js

@@ -557 +557 @@
                         $( '#wp-admin-bar-menu-toggle' ).on( 'click.wp-responsive', function( event ) {
                                 event.preventDefault();
                                 $wpwrap.toggleClass( 'wp-responsive-open' );
+                                if ( $wpwrap.hasClass( 'wp-responsive-open' ) ) {
+                                        event.target.setAttribute( 'aria-expanded', 'true' );
+                                        $( '#adminmenu a:first' ).focus();
+                                } else {
+                                        event.target.setAttribute( 'aria-expanded', 'false' );
+                                }
                         } );
 
                         // Add menu events

src/wp-includes/admin-bar.php

@@ -166 +166 @@
         if ( is_admin() ) {
                 $wp_admin_bar->add_menu( array(
                         'id'    => 'menu-toggle',
-                        'title' => '<span class="ab-icon"></span>',
+                        'title' => '<span class="ab-icon" aria-hidden="true"></span><span class="screen-reader-text">' . __( 'Menu' ) . '</span>',
                         'href'  => '#',
                         'meta'  => array(
-                                'title' => __( 'Menu' ),
+                                'expandable' => true,
                         ),
                 ) );
         }

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

@@ -409 +409 @@
                 $has_link  = ! empty( $node->href );
 
                 $tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : '';
+                $expandable = isset( $node->meta['expandable'] ) ? (bool) $node->meta['expandable'] : false;
+                
                 $aria_attributes = $tabindex ? 'tabindex="' . $tabindex . '"' : '';
+                if ( $expandable ) {
+                        $aria_attributes .= ' aria-expanded="false"';
+                }
 
                 $menuclass = '';