From 913c4cd69c53a8195e5e007957e2407c2084cf99 Mon Sep 17 00:00:00 2001
From: Lance Willett <nanobar@gmail.com>
Date: Mon, 16 Mar 2015 18:51:29 +0000
Subject: [PATCH] Twenty Fourteen: add ARIA attributes to search toggle. See
 #31527. Built from https://develop.svn.wordpress.org/trunk@31794

git-svn-id: http://core.svn.wordpress.org/trunk@31776 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfourteen/header.php      | 2 +-
 wp-content/themes/twentyfourteen/js/functions.js | 9 ++++++++-
 wp-includes/version.php                          | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyfourteen/header.php b/wp-content/themes/twentyfourteen/header.php
index 5343158da7..7286d88938 100644
--- a/wp-content/themes/twentyfourteen/header.php
+++ b/wp-content/themes/twentyfourteen/header.php
@@ -45,7 +45,7 @@
 			<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
 
 			<div class="search-toggle">
-				<a href="#search-container" class="screen-reader-text"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
+				<a href="#search-container" class="screen-reader-text" aria-expanded="false" aria-controls="search-container"><?php _e( 'Search', 'twentyfourteen' ); ?></a>
 			</div>
 
 			<nav id="primary-navigation" class="site-navigation primary-navigation" role="navigation">
diff --git a/wp-content/themes/twentyfourteen/js/functions.js b/wp-content/themes/twentyfourteen/js/functions.js
index 21da9a681a..d50443940a 100644
--- a/wp-content/themes/twentyfourteen/js/functions.js
+++ b/wp-content/themes/twentyfourteen/js/functions.js
@@ -69,11 +69,18 @@
 		// Search toggle.
 		$( '.search-toggle' ).on( 'click.twentyfourteen', function( event ) {
 			var that    = $( this ),
-				wrapper = $( '.search-box-wrapper' );
+				wrapper = $( '#search-container' ),
+				container = that.find( 'a' );
 
 			that.toggleClass( 'active' );
 			wrapper.toggleClass( 'hide' );
 
+			if ( that.hasClass( 'active' ) ) {
+				container.attr( 'aria-expanded', 'true' );
+			} else {
+				container.attr( 'aria-expanded', 'false' );
+			}
+
 			if ( that.is( '.active' ) || $( '.search-toggle .screen-reader-text' )[0] === event.target ) {
 				wrapper.find( '.search-field' ).focus();
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 50847f86c3..fce6f69aed 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta1-31793';
+$wp_version = '4.2-beta1-31794';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.