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

Timestamp:

07/12/2016 11:18:00 AM (8 years ago)

Author:

ocean90

Message:

Toolbar: Allow 0 as a value for the tabindex property of a menu item.

To enhance accessibility for items without a link you can now define tabindex="0", which makes descendant dropdowns accessible.

Props joedolson, afercia, ocean90.
Fixes #32495.

File:

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

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

@@ -478 +478 @@
         $has_link  = ! empty( $node->href );
 
-        $tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : '';
-        $aria_attributes = $tabindex ? 'tabindex="' . $tabindex . '"' : '';
+        // Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y.
+        $tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
+        $aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
 
         $menuclass = '';
@@ -498 +499 @@
         <li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
             if ( $has_link ):
-                ?><a class="ab-item" <?php echo $aria_attributes; ?> 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
@@ -519 +520 @@
                 ?>><?php
             else:
-                ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
+                ?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
                 if ( ! empty( $node->meta['title'] ) ) :
                     ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php