Changeset 33074

Timestamp:

07/03/2015 09:23:12 PM (11 years ago)

Author:

ocean90

Message:

Customizer: Improve descriptive text and focus for menu items reorder button.

props afercia.
fixes #32725.

Location:

trunk/src

Files:

• wp-admin/css/customize-nav-menus.css (modified) (1 diff)
• wp-admin/js/customize-nav-menus.js (modified) (2 diffs)
• wp-includes/class-wp-customize-control.php (modified) (1 diff)
• wp-includes/class-wp-customize-nav-menus.php (modified) (1 diff)

trunk/src/wp-admin/css/customize-nav-menus.css

@@ -92 +92 @@
 
 /* Menu-item reordering nav. */
-#customize-theme-controls button.reorder-toggle {
+#customize-theme-controls .reordering .reorder,
+#customize-theme-controls .reorder-done {
+        display: none;
+}
+
+#customize-theme-controls .reorder,
+#customize-theme-controls .reordering .reorder-done {
+        display: inline-block;
         padding: 5px 8px;
 }

trunk/src/wp-admin/js/customize-nav-menus.js

@@ -1933 +1933 @@
                  */
                 toggleReordering: function( showOrHide ) {
+                        var addNewItemBtn = this.container.find( '.add-new-menu-item' ),
+                                reorderBtn = this.container.find( '.reorder-toggle' );
+
                         showOrHide = Boolean( showOrHide );
 
@@ -1942 +1945 @@
                         this.$sectionContent.toggleClass( 'reordering', showOrHide );
                         this.$sectionContent.sortable( this.isReordering ? 'disable' : 'enable' );
+                        if ( this.isReordering ) {
+                                addNewItemBtn.attr( 'tabindex', '-1' );
+                                reorderBtn.find( '.reorder-done' ).focus();
+                                wp.a11y.speak( api.Menus.data.l10n.reorderModeOn );
+                        } else {
+                                addNewItemBtn.removeAttr( 'tabindex' );
+                                reorderBtn.find( '.reorder' ).focus();
+                                wp.a11y.speak( api.Menus.data.l10n.reorderModeOff );
+                        }
 
                         if ( showOrHide ) {

trunk/src/wp-includes/class-wp-customize-control.php

@@ -1451 +1451 @@
                         <?php _e( 'Add Items' ); ?>
                 </button>
-                <button type="button" class="not-a-button reorder-toggle">
-                        <span class="reorder"><?php _ex( 'Reorder', 'Reorder menu items in Customizer' ); ?></span>
-                        <span class="reorder-done"><?php _ex( 'Done', 'Cancel reordering menu items in Customizer' ); ?></span>
+                <button type="button" role="presentation" class="not-a-button reorder-toggle" tabindex="-1">
+                        <span class="reorder" tabindex="0" role="button" aria-label="<?php esc_attr_e( 'Reorder menu items' ); ?>" aria-describedby="reorder-items-desc"><?php _ex( 'Reorder', 'Reorder menu items in Customizer' ); ?></span>
+                        <span class="reorder-done" tabindex="0" role="button" aria-label="<?php esc_attr_e( 'Close reorder mode' ); ?>"><?php _ex( 'Done', 'Cancel reordering menu items in Customizer' ); ?></span>
                 </button>
+                <p class="screen-reader-text" id="reorder-items-desc"><?php _e( 'When in reorder mode, additional controls to reorder menu items will be available in the items list above.' ); ?></p>
                 <span class="add-menu-item-loading spinner"></span>
                 <span class="menu-delete-item">

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -306 +306 @@
                                 'itemsFoundMore'    => __( 'Additional items found: %d' ),
                                 'itemsLoadingMore'  => __( 'Loading more results... please wait.' ),
+                                'reorderModeOn'     => __( 'Reorder mode enabled' ),
+                                'reorderModeOff'    => __( 'Reorder mode closed' ),
                         ),
                         'menuItemTransport'    => 'postMessage',