<!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>[27606] trunk/src/wp-content/themes/twentytwelve: Twenty Twelve: 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/27606">27606</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2014-03-19 05:28:24 +0000 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: improve menu navigation for keyboard and voice-over interactions by properly focusing on submenu items when they are open. See <a href="http://core.trac.wordpress.org/ticket/24839">#24839</a>, props dannydehaan, joedolson, lancewillett.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentytwelvecssiecss">trunk/src/wp-content/themes/twentytwelve/css/ie.css</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvefunctionsphp">trunk/src/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvejsnavigationjs">trunk/src/wp-content/themes/twentytwelve/js/navigation.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvestylecss">trunk/src/wp-content/themes/twentytwelve/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentytwelvecssiecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/css/ie.css (27605 => 27606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/css/ie.css 2014-03-19 05:27:37 UTC (rev 27605)
+++ trunk/src/wp-content/themes/twentytwelve/css/ie.css 2014-03-19 05:28:24 UTC (rev 27606)
</span><span class="lines">@@ -104,23 +104,38 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> .main-navigation li ul {
</span><del>- display: none;
</del><span class="cx"> margin: 0;
</span><span class="cx"> padding: 0;
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 100%;
</span><span class="cx"> z-index: 1;
</span><ins>+ height: 1px;
+ width: 1px;
+ overflow: hidden;
+ clip: rect(1px, 1px, 1px, 1px);
</ins><span class="cx"> }
</span><span class="cx"> .ie7 .main-navigation li ul {
</span><ins>+ clip: inherit;
+ display: none;
</ins><span class="cx"> left: 0;
</span><ins>+ overflow: visible;
</ins><span class="cx"> }
</span><span class="cx"> .main-navigation li ul ul,
</span><span class="cx"> .ie7 .main-navigation li ul ul {
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 100%;
</span><span class="cx"> }
</span><del>-.main-navigation ul li:hover > ul {
</del><ins>+.main-navigation ul li:hover > ul,
+.main-navigation ul li:focus > ul,
+.main-navigation .focus > ul {
</ins><span class="cx"> border-left: 0;
</span><ins>+ clip: inherit;
+ overflow: inherit;
+ height: inherit;
+ width: inherit;
+}
+.ie7 .main-navigation ul li:hover > ul,
+.ie7 .main-navigation ul li:focus > ul {
</ins><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx"> .main-navigation li ul li a {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/functions.php (27605 => 27606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/functions.php 2014-03-19 05:27:37 UTC (rev 27605)
+++ trunk/src/wp-content/themes/twentytwelve/functions.php 2014-03-19 05:28:24 UTC (rev 27606)
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> wp_enqueue_script( 'comment-reply' );
</span><span class="cx">
</span><span class="cx"> // Adds JavaScript for handling the navigation menu hide-and-show behavior.
</span><del>- wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '1.0', true );
</del><ins>+ wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20140318', true );
</ins><span class="cx">
</span><span class="cx"> $font_url = twentytwelve_get_font_url();
</span><span class="cx"> if ( ! empty( $font_url ) )
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvejsnavigationjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/js/navigation.js (27605 => 27606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/js/navigation.js 2014-03-19 05:27:37 UTC (rev 27605)
+++ trunk/src/wp-content/themes/twentytwelve/js/navigation.js 2014-03-19 05:28:24 UTC (rev 27606)
</span><span class="lines">@@ -1,16 +1,18 @@
</span><span class="cx"> /**
</span><del>- * navigation.js
- *
- * Handles toggling the navigation menu for small screens.
</del><ins>+ * Handles toggling the navigation menu for small screens and
+ * accessibility for submenu items.
</ins><span class="cx"> */
</span><span class="cx"> ( function() {
</span><span class="cx"> var nav = document.getElementById( 'site-navigation' ), button, menu;
</span><del>- if ( ! nav )
</del><ins>+ if ( ! nav ) {
</ins><span class="cx"> return;
</span><ins>+ }
+
</ins><span class="cx"> button = nav.getElementsByTagName( 'h3' )[0];
</span><span class="cx"> menu = nav.getElementsByTagName( 'ul' )[0];
</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"> if ( ! menu || ! menu.childNodes.length ) {
</span><span class="lines">@@ -19,10 +21,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> button.onclick = function() {
</span><del>- if ( -1 == menu.className.indexOf( 'nav-menu' ) )
</del><ins>+ if ( -1 === menu.className.indexOf( 'nav-menu' ) ) {
</ins><span class="cx"> menu.className = 'nav-menu';
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( -1 != button.className.indexOf( 'toggled-on' ) ) {
</del><ins>+ if ( -1 !== button.className.indexOf( 'toggled-on' ) ) {
</ins><span class="cx"> button.className = button.className.replace( ' toggled-on', '' );
</span><span class="cx"> menu.className = menu.className.replace( ' toggled-on', '' );
</span><span class="cx"> } else {
</span><span class="lines">@@ -30,4 +33,11 @@
</span><span class="cx"> menu.className += ' toggled-on';
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-} )();
</del><span class="cx">\ No newline at end of file
</span><ins>+} )();
+
+// Better focus for hidden submenu items for accessibility.
+( function( $ ) {
+ $( '.main-navigation' ).find( 'a' ).on( 'focus.twentytwelve blur.twentytwelve', function() {
+ $( this ).parents( '.menu-item, .page_item' ).toggleClass( 'focus' );
+ } );
+} )( jQuery );
</ins></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvestylecss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-content/themes/twentytwelve/style.css (27605 => 27606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-content/themes/twentytwelve/style.css 2014-03-19 05:27:37 UTC (rev 27605)
+++ trunk/src/wp-content/themes/twentytwelve/style.css 2014-03-19 05:28:24 UTC (rev 27606)
</span><span class="lines">@@ -590,7 +590,8 @@
</span><span class="cx"> .main-navigation a {
</span><span class="cx"> color: #5e5e5e;
</span><span class="cx"> }
</span><del>-.main-navigation a:hover {
</del><ins>+.main-navigation a:hover,
+.main-navigation a:focus {
</ins><span class="cx"> color: #21759b;
</span><span class="cx"> }
</span><span class="cx"> .main-navigation ul.nav-menu,
</span><span class="lines">@@ -1509,7 +1510,8 @@
</span><span class="cx"> text-transform: uppercase;
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> }
</span><del>- .main-navigation li a:hover {
</del><ins>+ .main-navigation li a:hover,
+ .main-navigation li a:focus {
</ins><span class="cx"> color: #000;
</span><span class="cx"> }
</span><span class="cx"> .main-navigation li {
</span><span class="lines">@@ -1518,20 +1520,28 @@
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx"> .main-navigation li ul {
</span><del>- display: none;
</del><span class="cx"> margin: 0;
</span><span class="cx"> padding: 0;
</span><span class="cx"> position: absolute;
</span><span class="cx"> top: 100%;
</span><span class="cx"> z-index: 1;
</span><ins>+ height: 1px;
+ width: 1px;
+ overflow: hidden;
+ clip: rect(1px, 1px, 1px, 1px);
</ins><span class="cx"> }
</span><span class="cx"> .main-navigation li ul ul {
</span><span class="cx"> top: 0;
</span><span class="cx"> left: 100%;
</span><span class="cx"> }
</span><del>- .main-navigation ul li:hover > ul {
</del><ins>+ .main-navigation ul li:hover > ul,
+ .main-navigation ul li:focus > ul,
+ .main-navigation .focus > ul {
</ins><span class="cx"> border-left: 0;
</span><del>- display: block;
</del><ins>+ clip: inherit;
+ overflow: inherit;
+ height: inherit;
+ width: inherit;
</ins><span class="cx"> }
</span><span class="cx"> .main-navigation li ul li a {
</span><span class="cx"> background: #efefef;
</span><span class="lines">@@ -1546,7 +1556,8 @@
</span><span class="cx"> width: 12.85714286rem;
</span><span class="cx"> white-space: normal;
</span><span class="cx"> }
</span><del>- .main-navigation li ul li a:hover {
</del><ins>+ .main-navigation li ul li a:hover,
+ .main-navigation li ul li a:focus {
</ins><span class="cx"> background: #e3e3e3;
</span><span class="cx"> color: #444;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>