Ticket #31527: 31527.twentythirteen.2.patch

wp-content/themes/twentythirteen/header.php

@@ -42 +42 @@
                                 <nav id="site-navigation" class="navigation main-navigation" role="navigation">
                                         <button class="menu-toggle"><?php _e( 'Menu', 'twentythirteen' ); ?></button>
                                         <a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
-                                        <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
+                                        <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu', 'menu_id' => 'primary-menu' ) ); ?>
                                         <?php get_search_form(); ?>
                                 </nav><!-- #site-navigation -->
                         </div><!-- #navbar -->

wp-content/themes/twentythirteen/js/functions.js

@@ -6 +6 @@
 
 ( function( $ ) {
         var body    = $( 'body' ),
-            _window = $( window );
+            _window = $( window ),
+                nav, button, menu, tertiary;
 
+        nav = $( '#site-navigation' );
+        button = nav.find( '.menu-toggle' );
+        menu = nav.find( '.nav-menu' );
+
         /**
          * Adds a top margin to the footer if the sidebar widget area is higher
          * than the rest of the page, to help the footer always visually clear
@@ -29 +34 @@
          * Enables menu toggle for small screens.
          */
         ( function() {
-                var nav = $( '#site-navigation' ), button, menu;
-                if ( ! nav ) {
+                if ( ! nav || ! button ) {
                         return;
                 }
 
-                button = nav.find( '.menu-toggle' );
-                if ( ! button ) {
-                        return;
-                }
-
                 // Hide button if menu is missing or empty.
-                menu = nav.find( '.nav-menu' );
                 if ( ! menu || ! menu.children().length ) {
                         button.hide();
                         return;
@@ -48 +46 @@
 
                 button.on( 'click.twentythirteen', function() {
                         nav.toggleClass( 'toggled-on' );
+                        if ( nav.hasClass( 'toggled-on' ) ) {
+                                $( this ).attr( 'aria-expanded', 'true' );
+                                menu.attr( 'aria-expanded', 'true' );
+                        } else {
+                                $( this ).attr( 'aria-expanded', 'false' );
+                                menu.attr( 'aria-expanded', 'false' );
+                        }
                 } );
 
                 // Fix sub-menus for touch devices.
@@ -69 +74 @@
                 } );
         } )();
 
+        // Add or remove ARIA attributes.
+        function onResizeARIA() {
+                if ( 643 > _window.width() ) {
+                        button.attr( 'aria-expanded', 'false' );
+                        menu.attr( 'aria-expanded', 'false' );
+                        button.attr( 'aria-controls', 'primary-menu' );
+                } else {
+                        button.removeAttr( 'aria-expanded' );
+                        menu.removeAttr( 'aria-expanded' );
+                        button.removeAttr( 'aria-controls' );
+                }
+        }
+
+        _window
+                .on( 'load.twentythirteen', onResizeARIA )
+                .on( 'resize.twentythirteen', function() {
+                        onResizeARIA();
+        } );
+
         /**
          * Makes "skip to content" link work correctly in IE9 and Chrome for better
          * accessibility.