From 8c1dfe43c87f5acfd229c6b0518789d4a96f12b1 Mon Sep 17 00:00:00 2001
From: Marius Hoch <hoo@online.de>
Date: Mon, 7 Oct 2013 12:02:01 +0200
Subject: [PATCH] Accessibility: Make the collapsible sidebar screen reader
 friendly

Change-Id: Ie928e7b7610f60e505bb75939e1face1cb6e8bcf
---
 skins/vector/collapsibleNav.js | 35 ++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/skins/vector/collapsibleNav.js b/skins/vector/collapsibleNav.js
index 67313c95fb..45258e50ad 100644
--- a/skins/vector/collapsibleNav.js
+++ b/skins/vector/collapsibleNav.js
@@ -7,17 +7,28 @@
 
 	// Use the same function for all navigation headings - don't repeat
 	function toggle( $element ) {
+		var isCollapsed = $element.parent().is( '.collapsed' );
+
 		$.cookie(
 			'vector-nav-' + $element.parent().attr( 'id' ),
-			$element.parent().is( '.collapsed' ),
+			isCollapsed,
 			{ 'expires': 30, 'path': '/' }
 		);
+
 		$element
 			.parent()
 			.toggleClass( 'expanded' )
 			.toggleClass( 'collapsed' )
 			.find( '.body' )
 			.slideToggle( 'fast' );
+		isCollapsed = !isCollapsed;
+
+		$element
+			.find( '> a' )
+			.attr( {
+				'aria-pressed': isCollapsed ? 'false' : 'true',
+				'aria-expanded': isCollapsed ? 'false' : 'true'
+			} );
 	}
 
 	/* Browser Support */
@@ -61,8 +72,18 @@
 			.each( function ( i ) {
 				var id = $(this).attr( 'id' ),
 					state = $.cookie( 'vector-nav-' + id );
+				$(this).find( 'ul:first' ).attr( 'id', id + '-list' );
 				// Add anchor tag to heading for better accessibility
-				$( this ).find( 'h3' ).wrapInner( $( '<a href="#"></a>' ).click( false ) );
+				$( this ).find( 'h3' ).wrapInner(
+					$( '<a>' )
+						.attr( {
+							href: '#',
+							'aria-haspopup': 'true',
+							'aria-controls': id + '-list',
+							role: 'button'
+						} )
+						.click( false )
+				);
 				// In the case that we are not showing the new version, let's show the languages by default
 				if (
 					state === 'true' ||
@@ -75,10 +96,20 @@
 						.find( '.body' )
 						.hide() // bug 34450
 						.show();
+					$(this).find( 'h3 > a' )
+						.attr( {
+							'aria-pressed': 'true',
+							'aria-expanded': 'true'
+						} );
 				} else {
 					$(this)
 						.addClass( 'collapsed' )
 						.removeClass( 'expanded' );
+					$(this).find( 'h3 > a' )
+						.attr( {
+							'aria-pressed': 'false',
+							'aria-expanded': 'false'
+						} );
 				}
 				// Re-save cookie
 				if ( state !== null ) {
-- 
2.20.1