Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Accessibility: Remove title attributes from the Menus screen. 

Also, adds missing labels and improves the existing ones. 
Updates the "custom links" labels and inputs in the Customizer too.
Introduces a generic, reusable, `.wp-initial-focus` CSS class to be used for
the sole purpose of setting the initial focus.
"Quick Search": uniform the attached events and avoids new AJAX requests to
be triggered when the pressed key doesn't change the searched term.

Fixes #35374.
Built from https://develop.svn.wordpress.org/trunk@36379


git-svn-id: http://core.svn.wordpress.org/trunk@36346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2016-01-22 14:26:27 +00:00
parent 6699b761e1
commit 450cbb3e81
12 changed files with 88 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
wp-admin/css/nav-menus-rtl.css
View File

@ -61,10 +61,6 @@ ul.add-menu-item-tabs li {
position: relative;
}
.blank-slate .menu-name {
height: 2em;
}
.blank-slate .menu-settings {
border: none;
margin-top: 0;
@ -179,7 +175,10 @@ ul.add-menu-item-tabs li {
}
#nav-menu-header .menu-name-label {
margin-top: 4px;
display: inline-block;
vertical-align: middle;
margin-left: 7px;
font-style: italic;
}
.nav-menus-php #post-body div.updated,
@ -248,27 +247,13 @@ ul.add-menu-item-tabs li {
border-left: 1px solid #ccc;
}
#wpbody .open-label {
display: block;
float:right;
}
#wpbody .open-label span {
padding-left: 10px;
}
.js .input-with-default-title {
color: #a0a5aa;
font-style: italic;
}
#menu-management .inside {
padding: 0 10px;
}
/* Add Menu Item Boxes */
.postbox .howto input,
.accordion-container .howto input {
.customlinkdiv .menu-item-textbox {
width: 180px;
float: left;
}
@ -277,10 +262,6 @@ ul.add-menu-item-tabs li {
margin: 0;
}
.customlinkdiv .howto input {
width: 180px;
}
.customlinkdiv p {
margin-top: 0
}
@ -355,6 +336,7 @@ ul.add-menu-item-tabs li {
/* Create Menu */
#menu-name {
width: 270px;
vertical-align: middle;
}
#manage-menu .inside {
@ -381,10 +363,10 @@ ul.add-menu-item-tabs li {
width: 180px;
}
.customlinkdiv label,
.nav-menus-php .howto span {
margin-top: 6px;
display: block;
float: right;
margin-top: 6px;
}
/* Menu item types */
@ -731,14 +713,12 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
/* Major/minor publishing actions (classes) */
.nav-menus-php .major-publishing-actions {
clear: both;
padding: 3px 0 6px;
padding: 7px 0 6px;
}
.nav-menus-php .major-publishing-actions .publishing-action {
text-align: left;
float: left;
line-height: 23px;
margin: 4px 0 1px;
}
.nav-menus-php .blank-slate .menu-settings {

2
wp-admin/css/nav-menus-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

38
wp-admin/css/nav-menus.css
View File

@ -61,10 +61,6 @@ ul.add-menu-item-tabs li {
position: relative;
}
.blank-slate .menu-name {
height: 2em;
}
.blank-slate .menu-settings {
border: none;
margin-top: 0;
@ -179,7 +175,10 @@ ul.add-menu-item-tabs li {
}
#nav-menu-header .menu-name-label {
margin-top: 4px;
display: inline-block;
vertical-align: middle;
margin-right: 7px;
font-style: italic;
}
.nav-menus-php #post-body div.updated,
@ -248,27 +247,13 @@ ul.add-menu-item-tabs li {
border-right: 1px solid #ccc;
}
#wpbody .open-label {
display: block;
float:left;
}
#wpbody .open-label span {
padding-right: 10px;
}
.js .input-with-default-title {
color: #a0a5aa;
font-style: italic;
}
#menu-management .inside {
padding: 0 10px;
}
/* Add Menu Item Boxes */
.postbox .howto input,
.accordion-container .howto input {
.customlinkdiv .menu-item-textbox {
width: 180px;
float: right;
}
@ -277,10 +262,6 @@ ul.add-menu-item-tabs li {
margin: 0;
}
.customlinkdiv .howto input {
width: 180px;
}
.customlinkdiv p {
margin-top: 0
}
@ -355,6 +336,7 @@ ul.add-menu-item-tabs li {
/* Create Menu */
#menu-name {
width: 270px;
vertical-align: middle;
}
#manage-menu .inside {
@ -381,10 +363,10 @@ ul.add-menu-item-tabs li {
width: 180px;
}
.customlinkdiv label,
.nav-menus-php .howto span {
margin-top: 6px;
display: block;
float: left;
margin-top: 6px;
}
/* Menu item types */
@ -731,14 +713,12 @@ body.menu-max-depth-11 { min-width: 1280px !important; }
/* Major/minor publishing actions (classes) */
.nav-menus-php .major-publishing-actions {
clear: both;
padding: 3px 0 6px;
padding: 7px 0 6px;
}
.nav-menus-php .major-publishing-actions .publishing-action {
text-align: right;
float: right;
line-height: 23px;
margin: 4px 0 1px;
}
.nav-menus-php .blank-slate .menu-settings {

2
wp-admin/css/nav-menus.min.css vendored
View File

File diff suppressed because one or more lines are too long

18
wp-admin/includes/nav-menu.php
View File

@ -264,17 +264,13 @@ function wp_nav_menu_item_link_meta_box() {
<div class="customlinkdiv" id="customlinkdiv">
<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
<p id="menu-item-url-wrap">
<label class="howto" for="custom-menu-item-url">
<span><?php _e('URL'); ?></span>
<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
</label>
<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
</p>
<p id="menu-item-name-wrap">
<label class="howto" for="custom-menu-item-name">
<span><?php _e( 'Link Text' ); ?></span>
<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Menu Item'); ?>" />
</label>
<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
</p>
<p class="button-controls">
@ -435,7 +431,8 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
}
?>
<p class="quick-search-wrap">
<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
<span class="spinner"></span>
<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
</p>
@ -714,7 +711,8 @@ function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
}
?>
<p class="quick-search-wrap">
<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
<span class="spinner"></span>
<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
</p>

3
wp-admin/js/common.js
View File

@ -913,6 +913,9 @@ $document.ready( function() {
aria_button_if_js();
$document.on( 'wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
// Set initial focus on a specific element.
$( '.wp-initial-focus' ).focus();
});
// Fire a custom jQuery event at the end of window resize

2
wp-admin/js/common.min.js vendored
View File

File diff suppressed because one or more lines are too long

81
wp-admin/js/nav-menu.js
View File

@ -30,6 +30,7 @@ var wpNavMenu;
menusChanged : false,
isRTL: !! ( 'undefined' != typeof isRtl && isRtl ),
negateIfRTL: ( 'undefined' != typeof isRtl && isRtl ) ? -1 : 1,
lastSearch: '',
// Functions that run on init.
init : function() {
@ -40,7 +41,6 @@ var wpNavMenu;
this.attachMenuEditListeners();
this.setupInputWithDefaultTitle();
this.attachQuickSearchListeners();
this.attachThemeLocationsListeners();
@ -444,35 +444,35 @@ var wpNavMenu;
// Where can they move this menu item?
if ( 0 !== position ) {
thisLink = menuItem.find( '.menus-move-up' );
thisLink.prop( 'title', menus.moveUp ).css( 'display', 'inline' );
thisLink.attr( 'aria-label', menus.moveUp ).css( 'display', 'inline' );
}
if ( 0 !== position && isPrimaryMenuItem ) {
thisLink = menuItem.find( '.menus-move-top' );
thisLink.prop( 'title', menus.moveToTop ).css( 'display', 'inline' );
thisLink.attr( 'aria-label', menus.moveToTop ).css( 'display', 'inline' );
}
if ( position + 1 !== totalMenuItems && 0 !== position ) {
thisLink = menuItem.find( '.menus-move-down' );
thisLink.prop( 'title', menus.moveDown ).css( 'display', 'inline' );
thisLink.attr( 'aria-label', menus.moveDown ).css( 'display', 'inline' );
}
if ( 0 === position && 0 !== hasSameDepthSibling ) {
thisLink = menuItem.find( '.menus-move-down' );
thisLink.prop( 'title', menus.moveDown ).css( 'display', 'inline' );
thisLink.attr( 'aria-label', menus.moveDown ).css( 'display', 'inline' );
}
if ( ! isPrimaryMenuItem ) {
thisLink = menuItem.find( '.menus-move-left' ),
thisLinkText = menus.outFrom.replace( '%s', prevItemNameLeft );
thisLink.prop( 'title', menus.moveOutFrom.replace( '%s', prevItemNameLeft ) ).text( thisLinkText ).css( 'display', 'inline' );
thisLink.attr( 'aria-label', menus.moveOutFrom.replace( '%s', prevItemNameLeft ) ).text( thisLinkText ).css( 'display', 'inline' );
}
if ( 0 !== position ) {
if ( menuItem.find( '.menu-item-data-parent-id' ).val() !== menuItem.prev().find( '.menu-item-data-db-id' ).val() ) {
thisLink = menuItem.find( '.menus-move-right' ),
thisLinkText = menus.under.replace( '%s', prevItemNameRight );
thisLink.prop( 'title', menus.moveUnder.replace( '%s', prevItemNameRight ) ).text( thisLinkText ).css( 'display', 'inline' );
thisLink.attr( 'aria-label', menus.moveUnder.replace( '%s', prevItemNameRight ) ).text( thisLinkText ).css( 'display', 'inline' );
}
}
@ -494,7 +494,8 @@ var wpNavMenu;
title = menus.subMenuFocus.replace( '%1$s', itemName ).replace( '%2$d', itemPosition ).replace( '%3$s', parentItemName );
}
$this.prop('title', title).text( title );
// @todo Consider to update just the `aria-label` attribute.
$this.attr( 'aria-label', title ).text( title );
// Mark this item's accessibility as refreshed
$this.data( 'needs_accessibility_refresh', false );
@ -833,36 +834,6 @@ var wpNavMenu;
});
},
/**
* An interface for managing default values for input elements
* that is both JS and accessibility-friendly.
*
* Input elements that add the class 'input-with-default-title'
* will have their values set to the provided HTML title when empty.
*/
setupInputWithDefaultTitle : function() {
var name = 'input-with-default-title';
$('.' + name).each( function(){
var $t = $(this), title = $t.attr('title'), val = $t.val();
$t.data( name, title );
if( '' === val ) $t.val( title );
else if ( title == val ) return;
else $t.removeClass( name );
}).focus( function(){
var $t = $(this);
if( $t.val() == $t.data(name) )
$t.val('').removeClass( name );
}).blur( function(){
var $t = $(this);
if( '' === $t.val() )
$t.addClass( name ).val( $t.data(name) );
});
$( '.blank-slate .input-with-default-title' ).focus();
},
attachThemeLocationsListeners : function() {
var loc = $('#nav-menu-theme-locations'), params = {};
params.action = 'menu-locations-save';
@ -880,9 +851,21 @@ var wpNavMenu;
},
attachQuickSearchListeners : function() {
var searchTimer;
var searchTimer,
inputEvent;
$('.quick-search').keypress(function(e){
/*
* Use feature detection to determine whether password inputs should use
* the `keyup` or `input` event. Input is preferred but lacks support
* in legacy browsers. See changeset 34078, see also ticket #26600#comment:59
*/
if ( 'oninput' in document.createElement( 'input' ) ) {
inputEvent = 'input';
} else {
inputEvent = 'keyup';
}
$( '.quick-search' ).on( inputEvent, function( e ) {
var t = $(this);
if( 13 == e.which ) {
@ -894,16 +877,26 @@ var wpNavMenu;
searchTimer = setTimeout(function(){
api.updateQuickSearchResults( t );
}, 400);
}, 500 );
}).on( 'blur', function() {
api.lastSearch = '';
}).attr('autocomplete','off');
},
updateQuickSearchResults : function(input) {
var panel, params,
minSearchLength = 2,
q = input.val();
minSearchLength = 2,
q = input.val();
if( q.length < minSearchLength ) return;
/*
* Minimum characters for a search. Also avoid a new AJAX search when
* the pressed key (e.g. arrows) doesn't change the searched term.
*/
if ( q.length < minSearchLength || api.lastSearch == q ) {
return;
}
api.lastSearch = q;
panel = input.parents('.tabs-panel');
params = {

2
wp-admin/js/nav-menu.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
wp-admin/nav-menus.php
View File

@ -736,17 +736,21 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' );
if ( $one_theme_location_no_menus ) { ?>
$menu_name_aria_desc = $add_new_screen ? ' aria-describedby="menu-name-desc"' : '';
if ( $one_theme_location_no_menus ) {
$menu_name_val = 'value="' . esc_attr( 'Menu 1' ) . '"';
?>
<input type="hidden" name="zero-menu-state" value="true" />
<?php } ?>
<?php } else {
$menu_name_val = 'value="' . esc_attr( $nav_menu_selected_title ) . '"';
} ?>
<input type="hidden" name="action" value="update" />
<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
<div id="nav-menu-header">
<div class="major-publishing-actions">
<label class="menu-name-label howto open-label" for="menu-name">
<span><?php _e( 'Menu Name' ); ?></span>
<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e( 'Enter menu name here' ); ?>" value="<?php if ( $one_theme_location_no_menus ) _e( 'Menu 1' ); else echo esc_attr( $nav_menu_selected_title ); ?>" />
</label>
<label class="menu-name-label" for="menu-name"><?php _e( 'Menu Name' ); ?></label>
<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox" <?php echo $menu_name_val . $menu_name_aria_desc; ?> />
<div class="publishing-action">
<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
</div><!-- END .publishing-action -->
@ -769,7 +773,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
<?php } ?>
<?php endif; ?>
<?php if ( $add_new_screen ) : ?>
<p class="post-body-plain"><?php _e( 'Give your menu a name above, then click Create Menu.' ); ?></p>
<p class="post-body-plain" id="menu-name-desc"><?php _e( 'Give your menu a name, then click Create Menu.' ); ?></p>
<?php if ( isset( $_GET['use-location'] ) ) : ?>
<input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
<?php endif; ?>
@ -801,7 +805,7 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
<label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
<?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
<span class="theme-location-set"><?php
<span class="theme-location-set"><?php
/* translators: %s: menu name */
printf( _x( '(Currently set to: %s)', 'menu location' ),
wp_get_nav_menu_object( $menu_locations[ $location ] )->name

14
wp-includes/class-wp-customize-nav-menus.php
View File

@ -743,19 +743,15 @@ final class WP_Customize_Nav_Menus {
<span class="toggle-indicator" aria-hidden="true"></span>
</button>
</h4>
<div class="accordion-section-content">
<div class="accordion-section-content customlinkdiv">
<input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
<p id="menu-item-url-wrap">
<label class="howto" for="custom-menu-item-url">
<span><?php _e( 'URL' ); ?></span>
<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
</label>
<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
<input id="custom-menu-item-url" name="menu-item[-1][menu-item-url]" type="text" class="code menu-item-textbox" value="http://">
</p>
<p id="menu-item-name-wrap">
<label class="howto" for="custom-menu-item-name">
<span><?php _e( 'Link Text' ); ?></span>
<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
</label>
<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
<input id="custom-menu-item-name" name="menu-item[-1][menu-item-title]" type="text" class="regular-text menu-item-textbox">
</p>
<p class="button-controls">
<span class="add-to-menu">

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36377';
$wp_version = '4.5-alpha-36379';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.