<!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>[38035] trunk: Toolbar: Allow 0 as a value for the `tabindex` property of a menu item.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38035">38035</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38035","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-12 11:18:00 +0000 (Tue, 12 Jul 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/32495">#32495</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunksrcwpincludescssadminbarcss">trunk/src/wp-includes/css/admin-bar.css</a></li>
<li><a href="#trunktestsphpunittestsadminbarphp">trunk/tests/phpunit/tests/adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php 2016-07-12 00:19:47 UTC (rev 38034)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2016-07-12 11:18:00 UTC (rev 38035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,8 +477,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_parent = ! empty( $node->children );
</span><span class="cx" style="display: block; padding: 0 10px"> $has_link = ! empty( $node->href );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tabindex = isset( $node->meta['tabindex'] ) ? (int) $node->meta['tabindex'] : '';
- $aria_attributes = $tabindex ? 'tabindex="' . $tabindex . '"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 . '"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menuclass = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +498,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li id="<?php echo esc_attr( 'wp-admin-bar-' . $node->id ); ?>"<?php echo $menuclass; ?>><?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $has_link ):
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?><a class="ab-item" <?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?><a class="ab-item"<?php echo $aria_attributes; ?> href="<?php echo esc_url( $node->href ) ?>"<?php
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $node->meta['onclick'] ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,7 +519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>><?php
</span><span class="cx" style="display: block; padding: 0 10px"> else:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ?><div class="ab-item ab-empty-item" <?php echo $aria_attributes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?><div class="ab-item ab-empty-item"<?php echo $aria_attributes;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $node->meta['title'] ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre></div>
<a id="trunksrcwpincludescssadminbarcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/admin-bar.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/admin-bar.css 2016-07-12 00:19:47 UTC (rev 38034)
+++ trunk/src/wp-includes/css/admin-bar.css 2016-07-12 11:18:00 UTC (rev 38035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,6 +286,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .quicklinks .ab-sub-wrapper .menupop.hover > a,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .quicklinks .menupop.hover ul li a:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .quicklinks .menupop.hover ul li a:focus,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar .quicklinks .menupop.hover ul li div[tabindex]:hover,
+#wpadminbar .quicklinks .menupop.hover ul li div[tabindex]:focus,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar li:hover .ab-icon:before,
</span></span></pre></div>
<a id="trunktestsphpunittestsadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/adminbar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/adminbar.php 2016-07-12 00:19:47 UTC (rev 38034)
+++ trunk/tests/phpunit/tests/adminbar.php 2016-07-12 11:18:00 UTC (rev 38035)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $profile_url, $node_my_account->href );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $profile_url, $node_user_info->href );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $profile_url, $node_edit_profile->href );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,4 +253,96 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $wp_admin_bar;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 32495
+ *
+ * @dataProvider data_admin_bar_nodes_with_tabindex_meta
+ *
+ * @param array $node_data The data for a node, passed to `WP_Admin_Bar::add_node()`.
+ * @param string $expected_html The expected HTML when admin menu is rendered.
+ */
+ public function test_admin_bar_with_tabindex_meta( $node_data, $expected_html ) {
+ $admin_bar = new WP_Admin_Bar();
+ $admin_bar->add_node( $node_data );
+ $admin_bar_html = get_echo( array( $admin_bar, 'render' ) );
+ $this->assertContains( $expected_html, $admin_bar_html );
+ }
+
+ /**
+ * Data provider for test_admin_bar_with_tabindex_meta().
+ *
+ * @return array {
+ * @type array {
+ * @type array $node_data The data for a node, passed to `WP_Admin_Bar::add_node()`.
+ * @type string $expected_html The expected HTML when admin bar is rendered.
+ * }
+ * }
+ */
+ public function data_admin_bar_nodes_with_tabindex_meta() {
+ return array(
+ array(
+ // No tabindex.
+ array(
+ 'id' => 'test-node',
+ ),
+ '<div class="ab-item ab-empty-item">',
+ ),
+ array(
+ // Empty string.
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => '' ),
+ ),
+ '<div class="ab-item ab-empty-item">',
+ ),
+ array(
+ // Integer 1 as string.
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => '1' ),
+ ),
+ '<div class="ab-item ab-empty-item" tabindex="1">',
+ ),
+ array(
+ // Integer -1 as string.
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => '-1' ),
+ ),
+ '<div class="ab-item ab-empty-item" tabindex="-1">',
+ ),
+ array(
+ // Integer 0 as string.
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => '0' ),
+ ),
+ '<div class="ab-item ab-empty-item" tabindex="0">',
+ ),
+ array(
+ // Integer, 0.
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => 0 ),
+ ),
+ '<div class="ab-item ab-empty-item" tabindex="0">',
+ ),
+ array(
+ // Integer, 2.
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => 2 ),
+ ),
+ '<div class="ab-item ab-empty-item" tabindex="2">',
+ ),
+ array(
+ // Boolean, false
+ array(
+ 'id' => 'test-node',
+ 'meta' => array( 'tabindex' => false ),
+ ),
+ '<div class="ab-item ab-empty-item">',
+ ),
+ );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>