<!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>[19484] trunk: Add ARIA related attributes (first take), props DrewAPicture, see #19394</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, #logmsg > ol { margin-left: 0; 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/19484">19484</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-11-30 01:27:33 +0000 (Wed, 30 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add ARIA related attributes (first take), props DrewAPicture, see <a href="http://core.trac.wordpress.org/ticket/19394">#19394</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuheaderphp">trunk/wp-admin/menu-header.php</a></li>
<li><a href="#trunkwpincludesclasswpadminbarphp">trunk/wp-includes/class-wp-admin-bar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu-header.php (19483 => 19484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php 2011-11-30 01:21:38 UTC (rev 19483)
+++ trunk/wp-admin/menu-header.php 2011-11-30 01:27:33 UTC (rev 19484)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> foreach ( $menu as $key => $item ) {
</span><span class="cx"> $admin_is_parent = false;
</span><span class="cx"> $class = array();
</span><ins>+ $aria_attributes = 'tabindex="1" role="menuitem"';
</ins><span class="cx">
</span><span class="cx"> if ( $first ) {
</span><span class="cx"> $class[] = 'wp-first-item';
</span><span class="lines">@@ -53,16 +54,18 @@
</span><span class="cx"> $submenu_items = $submenu[$item[2]];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) )
</del><ins>+ if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
</ins><span class="cx"> $class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $class[] = 'wp-not-current-submenu';
</span><ins>+ if ( ! empty( $submenu_items ) )
+ $aria_attributes .= ' aria-haspopup="true"';
+ }
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $item[4] ) )
</span><span class="cx"> $class[] = $item[4];
</span><span class="cx">
</span><span class="cx"> $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
</span><del>- $tabindex = ' tabindex="1"';
</del><span class="cx"> $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
</span><span class="cx"> $img = '';
</span><span class="cx"> if ( ! empty( $item[6] ) )
</span><span class="lines">@@ -83,9 +86,9 @@
</span><span class="cx"> $menu_file = substr( $menu_file, 0, $pos );
</span><span class="cx"> if ( ! empty( $menu_hook ) || ( ('index.php' != $submenu_items[0][2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
</span><span class="cx"> $admin_is_parent = true;
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> } else {
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
</span><span class="cx"> $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
</span><span class="lines">@@ -94,14 +97,14 @@
</span><span class="cx"> $menu_file = substr( $menu_file, 0, $pos );
</span><span class="cx"> if ( ! empty( $menu_hook ) || ( ('index.php' != $item[2]) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) ) ) {
</span><span class="cx"> $admin_is_parent = true;
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> } else {
</span><del>- 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>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $submenu_items ) ) {
</span><del>- echo "\n\t<div class='wp-submenu'><div class='wp-submenu-wrap'>";
</del><ins>+ echo "\n\t<div class='wp-submenu' role='menu'><div class='wp-submenu-wrap'>";
</ins><span class="cx"> echo "<div class='wp-submenu-head'>{$item[0]}</div><ul>";
</span><span class="cx"> $first = true;
</span><span class="cx"> foreach ( $submenu_items as $sub_key => $sub_item ) {
</span><span class="lines">@@ -151,9 +154,9 @@
</span><span class="cx"> $sub_item_url = add_query_arg( array('page' => $sub_item[2]), 'admin.php' );
</span><span class="cx">
</span><span class="cx"> $sub_item_url = esc_url( $sub_item_url );
</span><del>- echo "<li$class><a href='$sub_item_url'$class$tabindex>$title</a></li>";
</del><ins>+ echo "<li$class><a href='$sub_item_url'$class $aria_attributes>$title</a></li>";
</ins><span class="cx"> } else {
</span><del>- echo "<li$class><a href='{$sub_item[2]}'$class$tabindex>$title</a></li>";
</del><ins>+ echo "<li$class><a href='{$sub_item[2]}'$class $aria_attributes>$title</a></li>";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> echo "</ul></div></div>";
</span><span class="lines">@@ -169,9 +172,9 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <div id="adminmenuback"></div>
</span><del>-<div id="adminmenuwrap">
</del><ins>+<div id="adminmenuwrap" role="navigation">
</ins><span class="cx"> <div id="adminmenushadow"></div>
</span><del>-<ul id="adminmenu">
</del><ins>+<ul id="adminmenu" role="menu">
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-admin-bar.php (19483 => 19484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php 2011-11-30 01:21:38 UTC (rev 19483)
+++ trunk/wp-includes/class-wp-admin-bar.php 2011-11-30 01:27:33 UTC (rev 19484)
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>- <div id="wpadminbar" class="<?php echo $class; ?>">
- <div class="quicklinks">
</del><ins>+ <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
+ <div class="quicklinks" role="menubar">
</ins><span class="cx"> <?php foreach ( $this->root->children as $group ) {
</span><span class="cx"> $this->render_group( $group, 'ab-top-menu' );
</span><span class="cx"> } ?>
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> if ( ! empty( $node->meta['class'] ) )
</span><span class="cx"> $class .= ' ' . $node->meta['class'];
</span><span class="cx">
</span><del>- ?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php
</del><ins>+ ?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>" role="menu"><?php
</ins><span class="cx"> foreach ( $node->children as $item ) {
</span><span class="cx"> $this->render_item( $item );
</span><span class="cx"> }
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> // Wrap the subgroups in a div and render each individual subgroup.
</span><span class="cx"> elseif ( ! $is_single_group ):
</span><del>- ?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container"><?php
</del><ins>+ ?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container" role="menu"><?php
</ins><span class="cx"> foreach ( $groups as $group ) {
</span><span class="cx"> $this->render_group( $group, $class );
</span><span class="cx"> }
</span><span class="lines">@@ -240,17 +240,24 @@
</span><span class="cx">
</span><span class="cx"> $is_parent = (bool) $node->children;
</span><span class="cx"> $has_link = (bool) $node->href;
</span><ins>+ $tabindex = isset($node->meta['tabindex']) ? (int) $node->meta['tabindex'] : 10;
</ins><span class="cx">
</span><del>- $menuclass = $is_parent ? 'menupop' : '';
</del><ins>+ $menuclass = '';
+ $aria_attributes = 'tabindex="' . $tabindex . '" role="menuitem"';
+
+ if ( $is_parent ) {
+ $menuclass = 'menupop';
+ $aria_attributes .= ' aria-haspopup="true"';
+ }
+
</ins><span class="cx"> if ( ! empty( $node->meta['class'] ) )
</span><span class="cx"> $menuclass .= ' ' . $node->meta['class'];
</span><span class="cx">
</span><del>- $tabindex = !empty($node->meta['tabindex']) ? $node->meta['tabindex'] : 10;
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"><?php
</span><span class="cx"> if ( $has_link ):
</span><del>- ?><a class="ab-item" tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>"<?php
</del><ins>+ ?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
</ins><span class="cx"> if ( ! empty( $node->meta['onclick'] ) ) :
</span><span class="cx"> ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
</span><span class="cx"> endif;
</span><span class="lines">@@ -262,7 +269,7 @@
</span><span class="cx"> endif;
</span><span class="cx"> ?>><?php
</span><span class="cx"> else:
</span><del>- ?><div class="ab-item ab-empty-item" tabindex="<?php echo (int) $tabindex; ?>"><?php
</del><ins>+ ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes; ?>><?php
</ins><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> echo $node->title;
</span></span></pre>
</div>
</div>
</body>
</html>