Ticket #24839: 24839.twenty-thirteen.4.diff

wp-content/themes/twentythirteen/css/editor-style.css

@@ -366 +366 @@
 }
 
 .mceTemp + ul,
-.mceTemp + ol  {
+.mceTemp + ol {
         list-style-position: inside;
 }
 

wp-content/themes/twentythirteen/css/ie.css

@@ -24 +24 @@
         text-decoration: none;
 }
 
+.nav-menu .sub-menu,
+.nav-menu .children {
+        clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
+}
+
 .nav-menu .sub-menu ul,
 .nav-menu .children ul {
         left: 100%;

wp-content/themes/twentythirteen/functions.php

@@ -168 +168 @@
                 wp_enqueue_script( 'jquery-masonry' );
 
         // Loads JavaScript file with functionality specific to Twenty Thirteen.
-        wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '2013-07-18', true );
+        wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '2014-03-18', true );
 
         // Add Source Sans Pro and Bitter fonts, used in the main stylesheet.
         wp_enqueue_style( 'twentythirteen-fonts', twentythirteen_fonts_url(), array(), null );

wp-content/themes/twentythirteen/js/functions.js

@@ -16 +16 @@
         $( function() {
                 if ( body.is( '.sidebar' ) ) {
                         var sidebar   = $( '#secondary .widget-area' ),
-                            secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
+                            secondary = ( 0 === sidebar.length ) ? -40 : sidebar.height(),
                             margin    = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
 
-                        if ( margin > 0 && _window.innerWidth() > 999 )
+                        if ( margin > 0 && _window.innerWidth() > 999 ) {
                                 $( '#colophon' ).css( 'margin-top', margin + 'px' );
+                        }
                 }
         } );
 
@@ -29 +30 @@
          */
         ( function() {
                 var nav = $( '#site-navigation' ), button, menu;
-                if ( ! nav )
+                if ( ! nav ) {
                         return;
+                }
 
                 button = nav.find( '.menu-toggle' );
-                if ( ! button )
+                if ( ! button ) {
                         return;
+                }
 
                 // Hide button if menu is missing or empty.
                 menu = nav.find( '.nav-menu' );
@@ -43 +46 @@
                         return;
                 }
 
-                $( '.menu-toggle' ).on( 'click.twentythirteen', function() {
+                button.on( 'click.twentythirteen', function() {
                         nav.toggleClass( 'toggled-on' );
                 } );
+
+                // 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' );
+                } );
         } )();
 
         /**
@@ -58 +66 @@
                 var element = document.getElementById( location.hash.substring( 1 ) );
 
                 if ( element ) {
-                        if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) )
+                        if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) ) {
                                 element.tabIndex = -1;
+                        }
 
                         element.focus();
                 }

wp-content/themes/twentythirteen/style.css

@@ -753 +753 @@
 }
 
 .wp-caption.alignleft + ul,
-.wp-caption.alignleft + ol  {
+.wp-caption.alignleft + ol {
         list-style-position: inside;
 }
 
@@ -867 +867 @@
 }
 
 .nav-menu li:hover > a,
-.nav-menu li a:hover {
+.nav-menu li a:hover,
+.nav-menu li:focus > a,
+.nav-menu li a:focus {
         background-color: #220e10;
         color: #fff;
 }
@@ -877 +879 @@
         background-color: #220e10;
         border: 2px solid #f7f5e7;
         border-top: 0;
-        display: none;
         padding: 0;
         position: absolute;
         left: -2px;
         z-index: 99999;
+        height: 1px; 
+        width: 1px; 
+        overflow: hidden;
+        clip: rect(1px, 1px, 1px, 1px)  
 }
 
 .nav-menu .sub-menu ul,
@@ -899 +904 @@
 }
 
 ul.nav-menu ul a:hover,
-.nav-menu ul ul a:hover {
+.nav-menu ul ul a:hover,
+ul.nav-menu ul a:focus,
+.nav-menu ul ul a:focus {
         background-color: #db572f;
 }
 
 ul.nav-menu li:hover > ul,
-.nav-menu ul li:hover > ul {
-        display: block;
+.nav-menu ul li:hover > ul ,
+ul.nav-menu .focus > ul,
+.nav-menu .focus > ul {
+        clip: inherit;
+        overflow: inherit;
+        height: inherit;
+        width: inherit;         
 }
 
 .nav-menu .current_page_item > a,