<!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>[32891] trunk/src: Customizer: Accessibility improvements for menu item searches.</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/32891">32891</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/32891","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>2015-06-20 19:21:38 +0000 (Sat, 20 Jun 2015)</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'>Customizer: Accessibility improvements for menu item searches.
* Add a description and an `aria-describedby` attribute to inform users this is a "live" search.
* Announce the number of search results via `wp.a11y.speak`.
* Use `aria-busy` attribute to stop screen readers announcing content while the "loading more results" is running.
* Increase the search debounce wait interval to 500ms to be consistent with other live searches.
* If a search fails don't call `wp.a11y.speak` with an undefined variable.
props afercia.
see <a href="https://core.trac.wordpress.org/ticket/32720">#32720</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizenavmenusjs">trunk/src/wp-admin/js/customize-nav-menus.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjscustomizenavmenusjs"></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/customize-nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-nav-menus.js 2015-06-20 19:00:05 UTC (rev 32890)
+++ trunk/src/wp-admin/js/customize-nav-menus.js 2015-06-20 19:21:38 UTC (rev 32891)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.$search = $( '#menu-items-search' );
</span><span class="cx" style="display: block; padding: 0 10px"> this.sectionContent = this.$el.find( '.accordion-section-content' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- this.debounceSearch = _.debounce( self.search, 250 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.debounceSearch = _.debounce( self.search, 500 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> _.bindAll( this, 'close' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,8 +211,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( page > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $section.addClass( 'loading-more' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content.attr( 'aria-busy', 'true' );
+ wp.a11y.speak( api.Menus.data.l10n.itemsLoadingMore );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( '' === self.searchTerm ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $content.html( '' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp.a11y.speak( '' );
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,6 +237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content.empty();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $section.removeClass( 'loading loading-more' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content.attr( 'aria-busy', 'false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $section.addClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> self.loading = false;
</span><span class="cx" style="display: block; padding: 0 10px"> items = new api.Menus.AvailableItemCollection( data.items );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,16 +250,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> self.pages.search = self.pages.search + 1;
</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 ( items && page > 1 ) {
+ wp.a11y.speak( api.Menus.data.l10n.itemsFoundMore.replace( '%d', items.length ) );
+ } else if ( items && page === 1 ) {
+ wp.a11y.speak( api.Menus.data.l10n.itemsFound.replace( '%d', items.length ) );
+ }
</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"> self.currentRequest.fail(function( data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content.empty().append( $( '<p class="nothing-found"></p>' ).text( data.message ) );
- wp.a11y.speak( data.message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // data.message may be undefined, for example when typing slow and the request is aborted.
+ if ( data.message ) {
+ $content.empty().append( $( '<p class="nothing-found"></p>' ).text( data.message ) );
+ wp.a11y.speak( data.message );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> self.pages.search = -1;
</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"> self.currentRequest.always(function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $section.removeClass( 'loading loading-more' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content.attr( 'aria-busy', 'false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> self.loading = false;
</span><span class="cx" style="display: block; padding: 0 10px"> self.currentRequest = null;
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-06-20 19:00:05 UTC (rev 32890)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2015-06-20 19:21:38 UTC (rev 32891)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,6 +291,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'pendingTitleTpl' => __( '%s (Pending)' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomyTermLabel' => __( 'Taxonomy' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'postTypeLabel' => __( 'Post Type' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'itemsFound' => __( 'Number of items found: %d' ),
+ 'itemsFoundMore' => __( 'Additional items found: %d' ),
+ 'itemsLoadingMore' => __( 'Loading more results... please wait.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'menuItemTransport' => 'postMessage',
</span><span class="cx" style="display: block; padding: 0 10px"> 'phpIntMax' => PHP_INT_MAX,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,7 +626,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="available-menu-items-search" class="accordion-section cannot-expand">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="accordion-section-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="menu-items-search"><?php _e( 'Search Menu Items' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items…' ) ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="text" id="menu-items-search" placeholder="<?php esc_attr_e( 'Search menu items…' ) ?>" aria-describedby="menu-items-search-desc" />
+ <p class="screen-reader-text" id="menu-items-search-desc"><?php _e( 'The search results will be updated as you type.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="accordion-section-content" data-type="search"></div>
</span></span></pre>
</div>
</div>
</body>
</html>