Merge pull request #297 from drupalprojects/7.x-3.x--aria-roles

Removing menu and menuitem roles

Author: RobLoach

includes/menu.inc

@@ -8,8 +8,7 @@
  * Implements theme_menu_tree().
  */
 function kalatheme_menu_tree($variables) {
-  // Set the aria role to menu
-  return '<ul class="menu clearfix" role="menu">' . $variables['tree'] . '</ul>';
+  return '<ul class="menu clearfix">' . $variables['tree'] . '</ul>';
 }
 
 
@@ -21,10 +20,6 @@ function kalatheme_menu_link($variables) {
   $element = $variables['element'];
   $sub_menu = '';
   $element['#attributes']['role'] = 'presentation';
-  // Enforce aria-role="menuitem"
-  $role = array('role'=> 'menuitem' );
-  $element['#localized_options']['attributes'] = isset($element['#localized_options']['attributes']) ? $element['#localized_options']['attributes']
-   +=  $role : $role;
   if ($element['#below']) {
     $sub_menu = drupal_render($element['#below']);
   }
@@ -37,11 +32,6 @@ function kalatheme_menu_link($variables) {
 function kalatheme_links__system_main_menu($variables) {
   $links = $variables['links'];
   $attributes = $variables['attributes'];
-
-  // Navbar best described by menubar, only add attribute if role="menu" isn't set
-  if(!isset($attributes['role'])){
-    $attributes['role'] = 'menubar';
-  }
   $heading = $variables['heading'];
   unset($links['#sorted']);
   unset($links['#theme_wrappers']);
@@ -92,8 +82,6 @@ function kalatheme_links__system_main_menu($variables) {
       if ( isset($link['#localized_options']['attributes'])){
         $link['#options']['attributes'] += $link['#localized_options']['attributes'];
       }
-      // lastly add in the role=menuitem for links
-      $link['#options']['attributes']['role'] = 'menuitem';
       // Add first/last/active classes to help out themers.
       if ($i == 1) {
         $class[] = 'first';
@@ -179,7 +167,6 @@ function kalatheme_links__system_main_menu($variables) {
           'links' => $link['#below'],
           'attributes' => array(
             'class' => array('dropdown-menu'),
-            'role' => 'menu',
             'aria-labelledby' => $dropdown_id,
             'aria-expanded' => 'false'
           ),
@@ -295,7 +282,7 @@ function kalatheme_menu_local_tasks(&$variables) {
 
   if (!empty($variables['primary'])) {
     $variables['primary']['#prefix'] = '<h3 class="sr-only">' . t('Primary tabs') . '</h3>';
-    $variables['primary']['#prefix'] = '<ul class="nav nav-pills" role="menu">';
+    $variables['primary']['#prefix'] = '<ul class="nav nav-pills">';
     $variables['primary']['#suffix'] = '</ul>';
     if (!empty($variables['secondary'])) {
       $variables = _kalatheme_associate_parent_tasks($variables);
@@ -342,16 +329,14 @@ function kalatheme_menu_local_task($variables) {
     $link_text .= ' <span class="caret" aria-hidden="true"></span>';
     $output = '<li class="' . implode(' ', $classes) . '" role="presentation">';
     $output .= l($link_text, $link['href'], $link['localized_options']);
-    $output .= '<ul class="dropdown-menu" role="menu">';
+    $output .= '<ul class="dropdown-menu">';
     $output .= drupal_render($children);
     $output .= '</ul>';
     $output .= '</li>';
     return $output;
   }
   else {
     $options = $link['localized_options'];
-    $role= array('role'=> 'menuitem');
-    $options['attributes'] = isset( $options['attributes'] ) ? $options['attributes'] += $role : $role;
     return '<li class="' . implode(' ', $classes) . '" role="presentation">' . l($link_text, $link['href'], $link['localized_options']) . "</li>\n";
   }
 }
@@ -367,7 +352,7 @@ function kalatheme_menu_local_actions($variables) {
   // Render the dropdown.
   $output = $container_attributes ?  '<li' . $container_attributes . '>' : '<li>';
   $output .= $toggle_attributes ?  '<a role="button"' . $toggle_attributes . '><span class="glyphicon glyphicon-wrench fa fa-wrench" aria-hidden="true"></span> ' . t('Actions') . '<span class="caret" aria-hidden="true"></span></a>' : '<a role="button">' . t('Actions') . '<span class="caret" aria-hidden="true"></span></a>';
-  $output .= $content_attributes ? '<ul' . $content_attributes . ' role="menu">' : '<ul role="menu">';
+  $output .= $content_attributes ? '<ul' . $content_attributes . '>' : '<ul role="menu">';
   $output .= drupal_render($variables['menu_actions']);
   $output .= '</ul>';
   $output .= '</li>';
@@ -384,10 +369,7 @@ function kalatheme_menu_local_action($variables) {
   $output = "<li role=\"presenation\">";
   if (isset($link['href'])) {
     $options = isset($link['localized_options']) ? $link['localized_options'] : array();
-    // Adding ARIA Attributes for the link as a menuitem
-    // @link http://www.w3.org/TR/wai-aria/roles#menuitem
     $a11y_attr =  array(
-      'role'=>'menuitem',
       'tab-index' => '-1'
     );
     $options['attributes'] = isset($options['attributes']) ? $options['attributes'] += $a11y_attr : $a11y_attr;