Changeset 21311 for trunk/wp-admin/menu-header.php

Timestamp:

07/24/2012 12:15:15 AM (13 years ago)

Author:

azaozz

Message:

Remove nearly all tabindex attributes from the admin, leaving them only where absolutely necessary (for now that's only the toolbar).

Add tabindex="-1" for the menu images links to avoid double tab stops there when the menu is expanded.

Fix/add auto-focus on the first input fields on the Add/Edit Post, all taxonomy, all edit taxonomy, Log In and Edit Comment screens.

See #21340.

File:

• trunk/wp-admin/menu-header.php (modified) (6 diffs)

trunk/wp-admin/menu-header.php

@@ -42 +42 @@
         $admin_is_parent = false;
         $class = array();
-        $aria_attributes = 'tabindex="1"';
+        $aria_attributes = '';
 
         if ( $first ) {
@@ -60 +60 @@
             $class[] = 'wp-not-current-submenu';
             if ( ! empty( $submenu_items ) )
-                $aria_attributes .= ' aria-haspopup="true"';
+                $aria_attributes .= 'aria-haspopup="true"';
         }
 
@@ -88 +88 @@
             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]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
+                echo "<div class='wp-menu-image'><a href='admin.php?page={$submenu_items[0][2]}' tabindex='-1' aria-label='$aria_label'>$img</a></div>$arrow<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
             } else {
-                echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='{$submenu_items[0][2]}' tabindex='-1' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$submenu_items[0][2]}'$class $aria_attributes>$title</a>";
             }
         } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
@@ -99 +99 @@
             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]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class $aria_attributes>{$item[0]}</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='admin.php?page={$item[2]}' tabindex='-1' aria-label='$aria_label'>$img</a></div>$arrow<a href='admin.php?page={$item[2]}'$class $aria_attributes>{$item[0]}</a>";
             } else {
-                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>";
+                echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}' tabindex='-1' aria-label='$aria_label'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>";
             }
         }
@@ -113 +113 @@
                     continue;
 
-                $aria_attributes = 'tabindex="1"';
                 $class = array();
                 if ( $first ) {
@@ -157 +156 @@
 
                     $sub_item_url = esc_url( $sub_item_url );
-                    echo "<li$class><a href='$sub_item_url'$class $aria_attributes>$title</a></li>";
+                    echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";
                 } else {
-                    echo "<li$class><a href='{$sub_item[2]}'$class $aria_attributes>$title</a></li>";
+                    echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";
                 }
             }