<!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>[41683] trunk/src/wp-admin: Accessibility: List Tables: use `aria-current` for the views current link.</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/41683">41683</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/41683","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-02 19:43:02 +0000 (Mon, 02 Oct 2017)</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'>Accessibility: List Tables: use `aria-current` for the views current link.
The `aria-current` attribute is a simple, effective way to help assistive
technologies users orientate themselves within a list of items. Continues the
introduction in core of the `aria-current` attribute after <a href="https://core.trac.wordpress.org/changeset/41359">[41359]</a> and <a href="https://core.trac.wordpress.org/changeset/41371">[41371]</a>.
Props joedolson, flixos90, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/32399">#32399</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,8 +246,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( 'comment_type', $comment_type, $link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $stati as $status => $label ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( $status === $comment_status ) ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $status === $comment_status ) {
+ $current_link_attributes = ' class="current" aria-current="page"';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $num_comments->$status ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $num_comments->$status = 10;
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( 'comment_status', $status, $link );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $_REQUEST['s'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( 's', esc_attr( wp_unslash( $_REQUEST['s'] ) ), $link );
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_links[ $status ] = "<a href='$link'$class>" . sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_links[ $status ] = "<a href='$link'$current_link_attributes>" . sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> translate_nooped_plural( $label, $num_comments->$status ),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '<span class="%s-count">%s</span>',
</span><span class="cx" style="display: block; padding: 0 10px"> ( 'moderated' === $status ) ? 'pending' : $status,
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,9 +306,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'themes.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'search' != $type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_links[$type] = sprintf( "<a href='%s'%s>%s</a>",
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( add_query_arg('theme_status', $type, $url) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $type === $status ) ? ' class="current"' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $type === $status ) ? ' class="current" aria-current="page"' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( $text, number_format_i18n( $count ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,11 +134,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $super_admins = get_super_admins();
</span><span class="cx" style="display: block; padding: 0 10px"> $total_admins = count( $super_admins );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = $role != 'super' ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['all'] = "<a href='" . network_admin_url('users.php') . "'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
- $class = $role === 'super' ? ' class="current"' : '';
- $role_links['super'] = "<a href='" . network_admin_url('users.php?role=super') . "'$class>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['all'] = "<a href='" . network_admin_url( 'users.php' ) . "'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+ $current_link_attributes = $role === 'super' ? ' class="current" aria-current="page"' : '';
+ $role_links['super'] = "<a href='" . network_admin_url( 'users.php?role=super' ) . "'$current_link_attributes>" . sprintf( _n( 'Super Admin <span class="count">(%s)</span>', 'Super Admins <span class="count">(%s)</span>', $total_admins ), number_format_i18n( $total_admins ) ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $role_links;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,9 +286,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $display_tabs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tabs as $action => $text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( $action === $tab ) ? ' current' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $href = self_admin_url('plugin-install.php?tab=' . $action);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $display_tabs['plugin-install-'.$action] = "<a href='$href'$current_link_attributes>$text</a>";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // No longer a real tab.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $display_tabs['plugin-install-upload'] );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,9 +432,9 @@
</span><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"> if ( 'search' !== $type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_links[$type] = sprintf( "<a href='%s'%s>%s</a>",
</ins><span class="cx" style="display: block; padding: 0 10px"> add_query_arg('plugin_status', $type, 'plugins.php'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $type === $status ) ? ' class="current"' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $type === $status ) ? ' class="current" aria-current="page"' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> sprintf( $text, number_format_i18n( $count ) )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,18 +231,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_edit_link( $args, $label, $class = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( $args, 'edit.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_html = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_html = $aria_current = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $class ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class_html = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> ' class="%s"',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $class )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'current' === $class ) {
+ $aria_current = ' aria-current="page"';
+ }
</ins><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"> return sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<a href="%s"%s>%s</a>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<a href="%s"%s%s>%s</a>',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( $url ),
</span><span class="cx" style="display: block; padding: 0 10px"> $class_html,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aria_current,
</ins><span class="cx" style="display: block; padding: 0 10px"> $label
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,9 +170,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $display_tabs = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tabs as $action => $text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ( $action === $tab ) ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = ( $action === $tab ) ? ' class="current" aria-current="page"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $href = self_admin_url('theme-install.php?tab=' . $action);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $display_tabs['theme-install-'.$action] = "<a href='$href'$class>$text</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $display_tabs['theme-install-'.$action] = "<a href='$href'$current_link_attributes>$text</a>";
</ins><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"> return $display_tabs;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,23 +196,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $avail_roles = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = empty($role) ? ' class="current"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = empty( $role ) ? ' class="current" aria-current="page"' : '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $count_users ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['all'] = "<a href='$url'$current_link_attributes>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['all'] = "<a href='$url'$class>" . _x( 'All', 'users' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['all'] = "<a href='$url'$current_link_attributes>" . _x( 'All', 'users' ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_roles->get_names() as $this_role => $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $count_users && !isset($avail_roles[$this_role]) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this_role === $role ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ' class="current"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = ' class="current" aria-current="page"';
</ins><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"> $name = translate_user_role( $name );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,15 +221,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: User role name with count */
</span><span class="cx" style="display: block; padding: 0 10px"> $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$current_link_attributes>$name</a>";
</ins><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"> if ( ! $count_users || ! empty( $avail_roles['none' ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'none' === $role ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = ' class="current"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = ' class="current" aria-current="page"';
</ins><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"> $name = __( 'No role' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: User role name with count */
</span><span class="cx" style="display: block; padding: 0 10px"> $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$current_link_attributes>$name</a>";
</ins><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></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2017-10-02 19:24:24 UTC (rev 41682)
+++ trunk/src/wp-admin/js/theme.js 2017-10-02 19:43:02 UTC (rev 41683)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1539,7 +1539,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> request.tag = [ value.slice( 4 ) ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.filter-links li > a.current' ).removeClass( 'current' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.filter-links li > a.current' )
+ .removeClass( 'current' )
+ .removeAttr( 'aria-current' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).removeClass( 'show-filters filters-applied show-favorites-form' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.drawer-toggle' ).attr( 'aria-expanded', 'false' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,9 +1666,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Track sorting so we can restore the correct tab when closing preview.
</span><span class="cx" style="display: block; padding: 0 10px"> themes.router.selectedTab = sort;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
- $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.filter-links li > a, .theme-filter' )
+ .removeClass( this.activeClass )
+ .removeAttr( 'aria-current' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '[data-sort="' + sort + '"]' )
+ .addClass( this.activeClass )
+ .attr( 'aria-current', 'page' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'favorites' === sort ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( 'body' ).addClass( 'show-favorites-form' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1686,8 +1694,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.filter-links li > a, .theme-section' ).removeClass( this.activeClass );
- $el.addClass( this.activeClass );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.filter-links li > a, .theme-section' )
+ .removeClass( this.activeClass )
+ .removeAttr( 'aria-current' );
+ $el
+ .addClass( this.activeClass )
+ .attr( 'aria-current', 'page' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! filter ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1725,7 +1737,10 @@
</span><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"> $( 'body' ).addClass( 'filters-applied' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.filter-links li > a.current' ).removeClass( 'current' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.filter-links li > a.current' )
+ .removeClass( 'current' )
+ .removeAttr( 'aria-current' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> filteringBy.empty();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( tags, function( tag ) {
</span></span></pre>
</div>
</div>
</body>
</html>