Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-25 13:52:59 +02:00
Code Issues Projects Releases Wiki Activity

Twenty Fifteen: add ARIA attributes to menu toggle.

Browse Source 
See #31527, props davidakennedy, lance.

Built from https://develop.svn.wordpress.org/trunk@31644


git-svn-id: http://core.svn.wordpress.org/trunk@31625 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2015-03-06 17:34:26 +00:00
parent 38df7e5048
commit 04ff214073
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
wp-content/themes/twentyfifteen/js/functions.js
View File

@ -8,7 +8,8 @@
( function( $ ) {
var $body, $window, $sidebar, adminbarOffset, top = false,
bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
topOffset = 0, bodyHeight, sidebarHeight, resizeTimer;
topOffset = 0, bodyHeight, sidebarHeight, resizeTimer,
secondary, button;
// Add dropdown toggle that display child menu items.
$( '.main-navigation .menu-item-has-children > a' ).after( '<button class="dropdown-toggle" aria-expanded="false">' + screenReaderText.expand + '</button>' );
@ -26,15 +27,13 @@
_this.html( _this.html() === screenReaderText.expand ? screenReaderText.collapse : screenReaderText.expand );
} );
secondary = $( '#secondary' );
button = $( '.site-branding' ).find( '.secondary-toggle' );
// Enable menu toggle for small screens.
( function() {
var secondary = $( '#secondary' ), button, menu, widgets, social;
if ( ! secondary ) {
return;
}
button = $( '.site-branding' ).find( '.secondary-toggle' );
if ( ! button ) {
var menu, widgets, social;
if ( ! secondary || ! button ) {
return;
}
@ -51,9 +50,29 @@
secondary.toggleClass( 'toggled-on' );
secondary.trigger( 'resize' );
$( this ).toggleClass( 'toggled-on' );
if ( $( this, secondary ).hasClass( 'toggled-on' ) ) {
$( this ).attr( 'aria-expanded', 'true' );
secondary.attr( 'aria-expanded', 'true' );
} else {
$( this ).attr( 'aria-expanded', 'false' );
secondary.attr( 'aria-expanded', 'false' );
}
} );
} )();
// Add or remove ARIA attributes.
function onResizeARIA() {
if ( 955 > $window.width() ) {
button.attr( 'aria-expanded', 'false' );
secondary.attr( 'aria-expanded', 'false' );
button.attr( 'aria-controls', 'secondary' );
} else {
button.removeAttr( 'aria-expanded' );
secondary.removeAttr( 'aria-expanded' );
button.removeAttr( 'aria-controls' );
}
}
// Sidebar scrolling.
function resize() {
windowWidth = $window.width();
@ -119,11 +138,13 @@
$window
.on( 'scroll.twentyfifteen', scroll )
.on( 'load.twentyfifteen', onResizeARIA )
.on( 'resize.twentyfifteen', function() {
clearTimeout( resizeTimer );
resizeTimer = setTimeout( resizeAndScroll, 500 );
onResizeARIA();
} );
$sidebar.on( 'click keydown', 'button', resizeAndScroll );
$sidebar.on( 'click.twentyfifteen keydown.twentyfifteen', 'button', resizeAndScroll );
resizeAndScroll();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31643';
$wp_version = '4.2-alpha-31644';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.