<!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>[19548] trunk: Remove role=&quot;menu&quot; and role=&quot;menuitem&quot; for now, fixes #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/19548">19548</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-12-05 17:47:23 +0000 (Mon, 05 Dec 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove role=&quot;menu&quot; and role=&quot;menuitem&quot; for now, fixes <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 (19547 => 19548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php        2011-12-03 09:35:38 UTC (rev 19547)
+++ trunk/wp-admin/menu-header.php        2011-12-05 17:47:23 UTC (rev 19548)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">         foreach ( $menu as $key =&gt; $item ) {
</span><span class="cx">                 $admin_is_parent = false;
</span><span class="cx">                 $class = array();
</span><del>-                $aria_attributes = 'tabindex=&quot;1&quot; role=&quot;menuitem&quot;';
</del><ins>+                $aria_attributes = 'tabindex=&quot;1&quot;';
</ins><span class="cx"> 
</span><span class="cx">                 if ( $first ) {
</span><span class="cx">                         $class[] = 'wp-first-item';
</span><span class="lines">@@ -104,14 +104,14 @@
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( ! empty( $submenu_items ) ) {
</span><del>-                        echo &quot;\n\t&lt;div class='wp-submenu' role='menu'&gt;&lt;div class='wp-submenu-wrap'&gt;&quot;;
</del><ins>+                        echo &quot;\n\t&lt;div class='wp-submenu'&gt;&lt;div class='wp-submenu-wrap'&gt;&quot;;
</ins><span class="cx">                         echo &quot;&lt;div class='wp-submenu-head'&gt;{$item[0]}&lt;/div&gt;&lt;ul&gt;&quot;;
</span><span class="cx">                         $first = true;
</span><span class="cx">                         foreach ( $submenu_items as $sub_key =&gt; $sub_item ) {
</span><span class="cx">                                 if ( ! current_user_can( $sub_item[1] ) )
</span><span class="cx">                                         continue;
</span><span class="cx"> 
</span><del>-                                $aria_attributes = 'tabindex=&quot;1&quot; role=&quot;menuitem&quot;';
</del><ins>+                                $aria_attributes = 'tabindex=&quot;1&quot;';
</ins><span class="cx">                                 $class = array();
</span><span class="cx">                                 if ( $first ) {
</span><span class="cx">                                         $class[] = 'wp-first-item';
</span><span class="lines">@@ -173,9 +173,9 @@
</span><span class="cx"> ?&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;div id=&quot;adminmenuback&quot;&gt;&lt;/div&gt;
</span><del>-&lt;div id=&quot;adminmenuwrap&quot; role=&quot;navigation&quot;&gt;
</del><ins>+&lt;div id=&quot;adminmenuwrap&quot;&gt;
</ins><span class="cx"> &lt;div id=&quot;adminmenushadow&quot;&gt;&lt;/div&gt;
</span><del>-&lt;ul id=&quot;adminmenu&quot; role=&quot;menu&quot;&gt;
</del><ins>+&lt;ul id=&quot;adminmenu&quot; role=&quot;navigation&quot;&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;?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 (19547 => 19548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-admin-bar.php        2011-12-03 09:35:38 UTC (rev 19547)
+++ trunk/wp-includes/class-wp-admin-bar.php        2011-12-05 17:47:23 UTC (rev 19548)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> 
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;div id=&quot;wpadminbar&quot; class=&quot;&lt;?php echo $class; ?&gt;&quot; role=&quot;navigation&quot;&gt;
</span><del>-                        &lt;div class=&quot;quicklinks&quot; role=&quot;menubar&quot;&gt;
</del><ins>+                        &lt;div class=&quot;quicklinks&quot;&gt;
</ins><span class="cx">                                 &lt;?php foreach ( $this-&gt;get_node( 'root' )-&gt;children as $group ) {
</span><span class="cx">                                         $this-&gt;_render_group( $group, 'ab-top-menu' );
</span><span class="cx">                                 } ?&gt;
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">                         if ( ! empty( $node-&gt;meta['class'] ) )
</span><span class="cx">                                 $class .= ' ' . $node-&gt;meta['class'];
</span><span class="cx"> 
</span><del>-                        ?&gt;&lt;ul id=&quot;&lt;?php echo esc_attr( &quot;wp-admin-bar-{$node-&gt;id}&quot; ); ?&gt;&quot; class=&quot;&lt;?php echo esc_attr( $class ); ?&gt;&quot; role=&quot;menu&quot;&gt;&lt;?php
</del><ins>+                        ?&gt;&lt;ul id=&quot;&lt;?php echo esc_attr( &quot;wp-admin-bar-{$node-&gt;id}&quot; ); ?&gt;&quot; class=&quot;&lt;?php echo esc_attr( $class ); ?&gt;&quot;&gt;&lt;?php
</ins><span class="cx">                                 foreach ( $node-&gt;children as $item ) {
</span><span class="cx">                                         $this-&gt;_render_item( $item );
</span><span class="cx">                                 }
</span><span class="lines">@@ -271,7 +271,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>-                        ?&gt;&lt;div id=&quot;&lt;?php echo esc_attr( &quot;wp-admin-bar-{$node-&gt;id}-container&quot; ); ?&gt;&quot; class=&quot;ab-group-container&quot; role=&quot;menu&quot;&gt;&lt;?php
</del><ins>+                        ?&gt;&lt;div id=&quot;&lt;?php echo esc_attr( &quot;wp-admin-bar-{$node-&gt;id}-container&quot; ); ?&gt;&quot; class=&quot;ab-group-container&quot;&gt;&lt;?php
</ins><span class="cx">                                 foreach ( $groups as $group ) {
</span><span class="cx">                                         $this-&gt;_render_group( $group, $class );
</span><span class="cx">                                 }
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx">                 $tabindex = isset( $node-&gt;meta['tabindex'] ) ? (int) $node-&gt;meta['tabindex'] : 10;
</span><span class="cx"> 
</span><span class="cx">                 $menuclass = '';
</span><del>-                $aria_attributes = 'tabindex=&quot;' . $tabindex . '&quot; role=&quot;menuitem&quot;';
</del><ins>+                $aria_attributes = 'tabindex=&quot;' . $tabindex . '&quot;';
</ins><span class="cx"> 
</span><span class="cx">                 if ( $is_parent ) {
</span><span class="cx">                         $menuclass = 'menupop';
</span></span></pre>
</div>
</div>

</body>
</html>