Changeset 19484 for trunk/wp-includes/class-wp-admin-bar.php

Timestamp:

11/30/2011 01:27:33 AM (13 years ago)

Author:

azaozz

Message:

Add ARIA related attributes (first take), props DrewAPicture, see #19394

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (5 diffs)

trunk/wp-includes/class-wp-admin-bar.php

@@ -180 +180 @@
 
         ?>
-        <div id="wpadminbar" class="<?php echo $class; ?>">
-            <div class="quicklinks">
+        <div id="wpadminbar" class="<?php echo $class; ?>" role="navigation">
+            <div class="quicklinks" role="menubar">
                 <?php foreach ( $this->root->children as $group ) {
                     $this->render_group( $group, 'ab-top-menu' );
@@ -219 +219 @@
                 $class .= ' ' . $node->meta['class'];
 
-            ?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>"><?php
+            ?><ul id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $class ); ?>" role="menu"><?php
                 foreach ( $node->children as $item ) {
                     $this->render_item( $item );
@@ -227 +227 @@
         // Wrap the subgroups in a div and render each individual subgroup.
         elseif ( ! $is_single_group ):
-            ?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container"><?php
+            ?><div id="<?php echo esc_attr( "wp-admin-bar-{$node->id}-container" ); ?>" class="ab-group-container" role="menu"><?php
                 foreach ( $groups as $group ) {
                     $this->render_group( $group, $class );
@@ -241 +241 @@
         $is_parent = (bool) $node->children;
         $has_link  = (bool) $node->href;
-
-        $menuclass = $is_parent ? 'menupop' : '';
+        $tabindex = isset($node->meta['tabindex']) ? (int) $node->meta['tabindex'] : 10;
+
+        $menuclass = '';
+        $aria_attributes = 'tabindex="' . $tabindex . '" role="menuitem"';
+
+        if ( $is_parent ) {
+            $menuclass = 'menupop';
+            $aria_attributes .= ' aria-haspopup="true"';
+        }
+
         if ( ! empty( $node->meta['class'] ) )
             $menuclass .= ' ' . $node->meta['class'];
 
-        $tabindex = !empty($node->meta['tabindex']) ? $node->meta['tabindex'] : 10;
         ?>
 
         <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"><?php
             if ( $has_link ):
-                ?><a class="ab-item" tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>"<?php
+                ?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
                     if ( ! empty( $node->meta['onclick'] ) ) :
                         ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
@@ -263 +270 @@
                 ?>><?php
             else:
-                ?><div class="ab-item ab-empty-item" tabindex="<?php echo (int) $tabindex; ?>"><?php
+                ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes; ?>><?php
             endif;