Changeset 19484 for trunk/wp-admin/menu-header.php
- Timestamp:
- 11/30/2011 01:27:33 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/menu-header.php
r19101 r19484 42 42 $admin_is_parent = false; 43 43 $class = array(); 44 $aria_attributes = 'tabindex="1" role="menuitem"'; 44 45 45 46 if ( $first ) { … … 54 55 } 55 56 56 if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) 57 if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) { 57 58 $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current'; 58 else59 } else { 59 60 $class[] = 'wp-not-current-submenu'; 61 if ( ! empty( $submenu_items ) ) 62 $aria_attributes .= ' aria-haspopup="true"'; 63 } 60 64 61 65 if ( ! empty( $item[4] ) ) … … 63 67 64 68 $class = $class ? ' class="' . join( ' ', $class ) . '"' : ''; 65 $tabindex = ' tabindex="1"';66 69 $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : ''; 67 70 $img = ''; … … 84 87 if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) { 85 88 $admin_is_parent = true; 86 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>";89 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 $aria_attributes>$title</a>"; 87 90 } else { 88 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>";91 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 $aria_attributes>$title</a>"; 89 92 } 90 93 } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) { … … 95 98 if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) { 96 99 $admin_is_parent = true; 97 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>";100 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 $aria_attributes>{$item[0]}</a>"; 98 101 } else { 99 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>";102 echo "\n\t<div class='wp-menu-image'><a href='{$item[2]}'>$img</a></div>$arrow<a href='{$item[2]}'$class $aria_attributes>{$item[0]}</a>"; 100 103 } 101 104 } 102 105 103 106 if ( ! empty( $submenu_items ) ) { 104 echo "\n\t<div class='wp-submenu' ><div class='wp-submenu-wrap'>";107 echo "\n\t<div class='wp-submenu' role='menu'><div class='wp-submenu-wrap'>"; 105 108 echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>"; 106 109 $first = true; … … 152 155 153 156 $sub_item_url = esc_url( $sub_item_url ); 154 echo "<li$class><a href='$sub_item_url'$class $tabindex>$title</a></li>";157 echo "<li$class><a href='$sub_item_url'$class $aria_attributes>$title</a></li>"; 155 158 } else { 156 echo "<li$class><a href='{$sub_item[2]}'$class $tabindex>$title</a></li>";159 echo "<li$class><a href='{$sub_item[2]}'$class $aria_attributes>$title</a></li>"; 157 160 } 158 161 } … … 170 173 171 174 <div id="adminmenuback"></div> 172 <div id="adminmenuwrap" >175 <div id="adminmenuwrap" role="navigation"> 173 176 <div id="adminmenushadow"></div> 174 <ul id="adminmenu" >177 <ul id="adminmenu" role="menu"> 175 178 176 179 <?php
Note: See TracChangeset
for help on using the changeset viewer.