Ticket #19191: 19191.diff

wp-admin/menu-header.php

@@ -83 +83 @@
                                 $menu_file = substr( $menu_file, 0, $pos );
                         if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
                                 $admin_is_parent = true;
-                                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class$tabindex>$title</a>";
+                                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}' tabindex='-1'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class$tabindex>$title</a>";
                         } else {
-                                echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class$tabindex>$title</a>";
+                                echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}' tabindex='-1'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class$tabindex>$title</a>";
                         }
                 } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
                         $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
@@ -94 +94 @@
                                 $menu_file = substr( $menu_file, 0, $pos );
                         if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
                                 $admin_is_parent = true;
-                                echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
+                                echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}' tabindex='-1'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class$tabindex>{$item[0]}</a>";
                         } else {
-                                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
+                                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}' tabindex='-1'>$img</a></div>$arrow<a href='{$item[2]}'$class$tabindex>{$item[0]}</a>";
                         }
                 }
 

wp-admin/js/common.dev.js

@@ -228 +228 @@
 
         // Admin menu keyboard navigation.
         $('li.wp-has-submenu').focusin( function() {
+                $('li.focused').removeClass('focused');
                 $(this).addClass('focused');
-        }).focusout( function() {
-                $(this).removeClass('focused');
         });
-
+        $('li.wp-has-submenu').last().focusout( function(e) {
+                if ($(this).find('a').last()[0] == e.target) {
+                        $(this).removeClass('focused');
+                }
+        });
+        
         // If the mouse is used on the menu, shift focus to the mouse.
         menu.mouseover( function(e) {
                 $('li.focused', this).removeClass('focused');