<!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>[46240] trunk/src: Accessibility: Menus: Improve the menu items "Select All".</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 { white-space: pre-line; 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/46240">46240</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/46240","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>2019-09-23 12:41:14 +0000 (Mon, 23 Sep 2019)</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: Menus: Improve the menu items "Select All".
- changes "Select All" from a link to a checkbox
- the new checkbox is available only when JavaScript support is on
- semantically and for accessibility, a checkbox is a better user interface control because the available action is clear to all users and the selected state is communicated natively
- it's consistent with the existing pattern for the admin tables
Props birgire, audrasjb, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/47048">#47048</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibnavmenujs">trunk/src/js/_enqueues/lib/nav-menu.js</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibnavmenujs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/nav-menu.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/nav-menu.js 2019-09-23 12:18:53 UTC (rev 46239)
+++ trunk/src/js/_enqueues/lib/nav-menu.js 2019-09-23 12:41:14 UTC (rev 46240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the items
</span><span class="cx" style="display: block; padding: 0 10px"> api.addItemToMenu(menuItems, processMethod, function(){
</span><span class="cx" style="display: block; padding: 0 10px"> // Deselect the items and hide the ajax spinner
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- checkboxes.removeAttr('checked');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ checkboxes.prop( 'checked', false );
+ t.find( '.button-controls .select-all' ).prop( 'checked', false );
</ins><span class="cx" style="display: block; padding: 0 10px"> t.find( '.button-controls .spinner' ).removeClass( 'is-active' );
</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">@@ -1061,7 +1062,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> attachTabsPanelListeners : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $('#menu-settings-column').bind('click', function(e) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var selectAreaMatch, panelId, wrapper, items,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var selectAreaMatch, selectAll, panelId, wrapper, items,
</ins><span class="cx" style="display: block; padding: 0 10px"> target = $(e.target);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( target.hasClass('nav-tab-link') ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1071,7 +1072,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wrapper = target.parents('.accordion-section-content').first();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // upon changing tabs, we want to uncheck all checkboxes
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('input', wrapper).removeAttr('checked');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( 'input', wrapper ).prop( 'checked', false );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('.tabs-panel-active', wrapper).removeClass('tabs-panel-active').addClass('tabs-panel-inactive');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#' + panelId, wrapper).removeClass('tabs-panel-inactive').addClass('tabs-panel-active');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1090,16 +1091,29 @@
</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"> e.preventDefault();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( target.hasClass('select-all') ) {
- selectAreaMatch = /#(.*)$/.exec(e.target.href);
- if ( selectAreaMatch && selectAreaMatch[1] ) {
- items = $('#' + selectAreaMatch[1] + ' .tabs-panel-active .menu-item-title input');
- if( items.length === items.filter(':checked').length )
- items.removeAttr('checked');
- else
- items.prop('checked', true);
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( target.hasClass( 'select-all' ) ) {
+ selectAreaMatch = target.closest( '.button-controls' ).data( 'items-type' );
+ if ( selectAreaMatch ) {
+ items = $( '#' + selectAreaMatch + ' .tabs-panel-active .menu-item-title input' );
+
+ if ( items.length === items.filter( ':checked' ).length && ! target.is( ':checked' ) ) {
+ items.prop( 'checked', false );
+ } else if ( target.is( ':checked' ) ) {
+ items.prop( 'checked', true );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else if ( target.hasClass( 'menu-item-checkbox' ) ) {
+ selectAreaMatch = target.closest( '.tabs-panel-active' ).parent().attr( 'id' );
+ if ( selectAreaMatch ) {
+ items = $( '#' + selectAreaMatch + ' .tabs-panel-active .menu-item-title input' );
+ selectAll = $( '.button-controls[data-items-type="' + selectAreaMatch + '"] .select-all' );
+
+ if ( items.length === items.filter( ':checked' ).length && ! selectAll.is( ':checked' ) ) {
+ selectAll.prop( 'checked', true );
+ } else if ( selectAll.is( ':checked' ) ) {
+ selectAll.prop( 'checked', false );
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( target.hasClass('submit-add-to-menu') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> api.registerChange();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1226,6 +1240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> pattern = /menu-item[(\[^]\]*/,
</span><span class="cx" style="display: block; padding: 0 10px"> $items = $('<div>').html(resp).find('li'),
</span><span class="cx" style="display: block; padding: 0 10px"> wrapper = panel.closest( '.accordion-section-content' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ selectAll = wrapper.find( '.button-controls .select-all' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $item;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if( ! $items.length ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1260,6 +1275,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $('.categorychecklist', panel).html( $items );
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.spinner', panel ).removeClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px"> wrapper.removeClass( 'has-no-menu-item' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( selectAll.is( ':checked' ) ) {
+ selectAll.prop( 'checked', false );
+ }
</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="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2019-09-23 12:18:53 UTC (rev 46239)
+++ trunk/src/wp-admin/includes/nav-menu.php 2019-09-23 12:41:14 UTC (rev 46240)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,11 +593,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $checkbox_items = walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $posts ), 0, (object) $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
- $checkbox_items = preg_replace( '/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items );
-
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> echo $checkbox_items;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -608,21 +603,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="button-controls wp-clearfix">
- <span class="list-controls">
- <a href="
- <?php
- echo esc_url(
- add_query_arg(
- array(
- $post_type_name . '-tab' => 'all',
- 'selectall' => 1,
- ),
- remove_query_arg( $removed_args )
- )
- );
- ?>
- #posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="button-controls wp-clearfix" data-items-type="posttype-<?php echo esc_attr( $post_type_name ); ?>">
+ <span class="list-controls hide-if-no-js">
+ <input type="checkbox" id="<?php echo esc_attr( $post_type_name . '-tab' ); ?>" class="select-all" />
+ <label for="<?php echo esc_attr( $post_type_name . '-tab' ); ?>"><?php _e( 'Select All' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-to-menu">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -848,21 +832,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="button-controls wp-clearfix">
- <span class="list-controls">
- <a href="
- <?php
- echo esc_url(
- add_query_arg(
- array(
- $taxonomy_name . '-tab' => 'all',
- 'selectall' => 1,
- ),
- remove_query_arg( $removed_args )
- )
- );
- ?>
- #taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="button-controls wp-clearfix" data-items-type="taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>">
+ <span class="list-controls hide-if-no-js">
+ <input type="checkbox" id="<?php echo esc_attr( $taxonomy_name . '-tab' ); ?>" class="select-all" />
+ <label for="<?php echo esc_attr( $taxonomy_name . '-tab' ); ?>"><?php _e( 'Select All' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-to-menu">
</span></span></pre>
</div>
</div>
</body>
</html>