<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27607] trunk/src/wp-content/themes/twentythirteen: Twenty Thirteen: improve menu navigation for keyboard and voice-over interactions by properly focusing on submenu items when they are open.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27607">27607</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2014-03-19 05:28:36 +0000 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: improve menu navigation for keyboard and voice-over interactions by properly focusing on submenu items when they are open. Closes <a href="http://core.trac.wordpress.org/ticket/24839">#24839</a>, props dannydehaan, joedolson, lancewillett, Frank Klein.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentythirteencsseditorstylecss">trunk/src/wp-content/themes/twentythirteen/css/editor-style.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteencssiecss">trunk/src/wp-content/themes/twentythirteen/css/ie.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenfunctionsphp">trunk/src/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenjsfunctionsjs">trunk/src/wp-content/themes/twentythirteen/js/functions.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenstylecss">trunk/src/wp-content/themes/twentythirteen/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentythirteencsseditorstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentythirteen/css/editor-style.css (27606 => 27607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentythirteen/css/editor-style.css 2014-03-19 05:28:24 UTC (rev 27606)
+++ trunk/src/wp-content/themes/twentythirteen/css/editor-style.css 2014-03-19 05:28:36 UTC (rev 27607)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .mceTemp + ul,
</span><del>-.mceTemp + ol {
</del><ins>+.mceTemp + ol {
</ins><span class="cx"> list-style-position: inside;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteencssiecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentythirteen/css/ie.css (27606 => 27607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentythirteen/css/ie.css 2014-03-19 05:28:24 UTC (rev 27606)
+++ trunk/src/wp-content/themes/twentythirteen/css/ie.css 2014-03-19 05:28:36 UTC (rev 27607)
</span><span class="lines">@@ -220,11 +220,17 @@
</span><span class="cx"> top: 40px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.ie7 .nav-menu li ul ul {
- left: 100%;
- top: 0;
</del><ins>+.ie7 .nav-menu .sub-menu,
+.ie7 .nav-menu .children {
+ display: none;
+ overflow: visible;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+.ie7 ul.nav-menu li:hover > ul,
+.ie7 .nav-menu ul li:hover > ul {
+ display: block;
+}
+
</ins><span class="cx"> .ie7 .site-header .search-form [type="search"],
</span><span class="cx"> .ie7 .site-header .search-form [type="text"] {
</span><span class="cx"> background-color: #fff;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentythirteen/functions.php (27606 => 27607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentythirteen/functions.php 2014-03-19 05:28:24 UTC (rev 27606)
+++ trunk/src/wp-content/themes/twentythirteen/functions.php 2014-03-19 05:28:36 UTC (rev 27607)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> wp_enqueue_script( 'jquery-masonry' );
</span><span class="cx">
</span><span class="cx"> // Loads JavaScript file with functionality specific to Twenty Thirteen.
</span><del>- wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '2013-07-18', true );
</del><ins>+ wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '2014-03-18', true );
</ins><span class="cx">
</span><span class="cx"> // Add Source Sans Pro and Bitter fonts, used in the main stylesheet.
</span><span class="cx"> wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenjsfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentythirteen/js/functions.js (27606 => 27607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentythirteen/js/functions.js 2014-03-19 05:28:24 UTC (rev 27606)
+++ trunk/src/wp-content/themes/twentythirteen/js/functions.js 2014-03-19 05:28:36 UTC (rev 27607)
</span><span class="lines">@@ -16,11 +16,12 @@
</span><span class="cx"> $( function() {
</span><span class="cx"> if ( body.is( '.sidebar' ) ) {
</span><span class="cx"> var sidebar = $( '#secondary .widget-area' ),
</span><del>- secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
</del><ins>+ secondary = ( 0 === sidebar.length ) ? -40 : sidebar.height(),
</ins><span class="cx"> margin = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
</span><span class="cx">
</span><del>- if ( margin > 0 && _window.innerWidth() > 999 )
</del><ins>+ if ( margin > 0 && _window.innerWidth() > 999 ) {
</ins><span class="cx"> $( '#colophon' ).css( 'margin-top', margin + 'px' );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> } );
</span><span class="cx">
</span><span class="lines">@@ -29,12 +30,14 @@
</span><span class="cx"> */
</span><span class="cx"> ( function() {
</span><span class="cx"> var nav = $( '#site-navigation' ), button, menu;
</span><del>- if ( ! nav )
</del><ins>+ if ( ! nav ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> button = nav.find( '.menu-toggle' );
</span><del>- if ( ! button )
</del><ins>+ if ( ! button ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Hide button if menu is missing or empty.
</span><span class="cx"> menu = nav.find( '.nav-menu' );
</span><span class="lines">@@ -43,9 +46,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $( '.menu-toggle' ).on( 'click.twentythirteen', function() {
</del><ins>+ button.on( 'click.twentythirteen', function() {
</ins><span class="cx"> nav.toggleClass( 'toggled-on' );
</span><span class="cx"> } );
</span><ins>+
+ // Better focus for hidden submenu items for accessibility.
+ menu.find( 'a' ).on( 'focus.twentythirteen blur.twentythirteen', function() {
+ $( this ).parents( '.menu-item, .page_item' ).toggleClass( 'focus' );
+ } );
</ins><span class="cx"> } )();
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -58,8 +66,9 @@
</span><span class="cx"> var element = document.getElementById( location.hash.substring( 1 ) );
</span><span class="cx">
</span><span class="cx"> if ( element ) {
</span><del>- if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) )
</del><ins>+ if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) ) {
</ins><span class="cx"> element.tabIndex = -1;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> element.focus();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentythirteen/style.css (27606 => 27607)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentythirteen/style.css 2014-03-19 05:28:24 UTC (rev 27606)
+++ trunk/src/wp-content/themes/twentythirteen/style.css 2014-03-19 05:28:36 UTC (rev 27607)
</span><span class="lines">@@ -753,7 +753,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .wp-caption.alignleft + ul,
</span><del>-.wp-caption.alignleft + ol {
</del><ins>+.wp-caption.alignleft + ol {
</ins><span class="cx"> list-style-position: inside;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -867,7 +867,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .nav-menu li:hover > a,
</span><del>-.nav-menu li a:hover {
</del><ins>+.nav-menu li a:hover,
+.nav-menu li:focus > a,
+.nav-menu li a:focus {
</ins><span class="cx"> background-color: #220e10;
</span><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="lines">@@ -877,11 +879,14 @@
</span><span class="cx"> background-color: #220e10;
</span><span class="cx"> border: 2px solid #f7f5e7;
</span><span class="cx"> border-top: 0;
</span><del>- display: none;
</del><span class="cx"> padding: 0;
</span><span class="cx"> position: absolute;
</span><span class="cx"> left: -2px;
</span><span class="cx"> z-index: 99999;
</span><ins>+ height: 1px;
+ width: 1px;
+ overflow: hidden;
+ clip: rect(1px, 1px, 1px, 1px);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .nav-menu .sub-menu ul,
</span><span class="lines">@@ -899,13 +904,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul.nav-menu ul a:hover,
</span><del>-.nav-menu ul ul a:hover {
</del><ins>+.nav-menu ul ul a:hover,
+ul.nav-menu ul a:focus,
+.nav-menu ul ul a:focus {
</ins><span class="cx"> background-color: #db572f;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul.nav-menu li:hover > ul,
</span><del>-.nav-menu ul li:hover > ul {
- display: block;
</del><ins>+.nav-menu ul li:hover > ul,
+ul.nav-menu .focus > ul,
+.nav-menu .focus > ul {
+ clip: inherit;
+ overflow: inherit;
+ height: inherit;
+ width: inherit;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .nav-menu .current_page_item > a,
</span></span></pre>
</div>
</div>
</body>
</html>