From 3366386aa3bbdfa75b17ac618a94b19be5c7eb3e Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Sun, 15 Mar 2015 19:59:53 +0000
Subject: [PATCH] Twenty Fourteen: add ARIA attributes to menu toggle. See
#31527.
git-svn-id: https://develop.svn.wordpress.org/trunk@31784 602fd350-edb4-49c9-b593-d223f7449a82
---
.../themes/twentyfourteen/functions.php | 2 +-
.../themes/twentyfourteen/header.php | 2 +-
.../themes/twentyfourteen/js/functions.js | 44 ++++++++++++++-----
3 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
index 3c8ebc7c77..bb23a2566b 100644
--- a/src/wp-content/themes/twentyfourteen/functions.php
+++ b/src/wp-content/themes/twentyfourteen/functions.php
@@ -260,7 +260,7 @@ function twentyfourteen_scripts() {
) );
}
- wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20140616', true );
+ wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150315', true );
}
add_action( 'wp_enqueue_scripts', 'twentyfourteen_scripts' );
diff --git a/src/wp-content/themes/twentyfourteen/header.php b/src/wp-content/themes/twentyfourteen/header.php
index 139e207faf..5343158da7 100644
--- a/src/wp-content/themes/twentyfourteen/header.php
+++ b/src/wp-content/themes/twentyfourteen/header.php
@@ -51,7 +51,7 @@
<nav id="primary-navigation" class="site-navigation primary-navigation" role="navigation">
<button class="menu-toggle"><?php _e( 'Primary Menu', 'twentyfourteen' ); ?></button>
<a class="screen-reader-text skip-link" href="#content"><?php _e( 'Skip to content', 'twentyfourteen' ); ?></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' ) ); ?>
</nav>
</div>
diff --git a/src/wp-content/themes/twentyfourteen/js/functions.js b/src/wp-content/themes/twentyfourteen/js/functions.js
index 7eddd83ef3..21da9a681a 100644
--- a/src/wp-content/themes/twentyfourteen/js/functions.js
+++ b/src/wp-content/themes/twentyfourteen/js/functions.js
@@ -7,29 +7,34 @@
*/
( function( $ ) {
var body = $( 'body' ),
- _window = $( window );
+ _window = $( window ),
+ nav, button, menu;
+
+ nav = $( '#primary-navigation' );
+ button = nav.find( '.menu-toggle' );
+ menu = nav.find( '.nav-menu' );
// Enable menu toggle for small screens.
( function() {
- var nav = $( '#primary-navigation' ), button, menu;
- if ( ! nav ) {
- return;
- }
-
- button = nav.find( '.menu-toggle' );
- if ( ! button ) {
+ if ( ! nav || ! button ) {
return;
}
// Hide button if menu is missing or empty.
- menu = nav.find( '.nav-menu' );
if ( ! menu || ! menu.children().length ) {
button.hide();
return;
}
- $( '.menu-toggle' ).on( 'click.twentyfourteen', function() {
+ button.on( 'click.twentyfourteen', 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' );
+ }
} );
} )();
@@ -109,6 +114,25 @@
} );
} );
+ // Add or remove ARIA attributes.
+ function onResizeARIA() {
+ if ( 781 > _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.twentyfourteen', onResizeARIA )
+ .on( 'resize.twentyfourteen', function() {
+ onResizeARIA();
+ } );
+
_window.load( function() {
// Arrange footer widgets vertically.
if ( $.isFunction( $.fn.masonry ) ) {