Changeset 46842 for trunk/src/wp-admin/includes/nav-menu.php

Timestamp:

12/09/2019 01:47:12 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Accessibility: Menus: Properly disable form controls on the Menus screen that cannot be used until at least one menu is created.

This ensures that the actual UI controls state matches the visually conveyed state.

Props afercia, audrasjb, dinhtungdu, sathyapulse, simonjanin, welcher, SergeyBiryukov.
Fixes #48409.

File:

• trunk/src/wp-admin/includes/nav-menu.php (modified) (6 diffs)

trunk/src/wp-admin/includes/nav-menu.php

@@ -256 +256 @@
 
 /**
- * Check whether to disable the Menu Locations meta box submit button
+ * Check whether to disable the Menu Locations meta box submit button and inputs.
  *
  * @since 3.6.0
+ * @since 5.3.1 The `$echo` parameter was added.
  *
  * @global bool $one_theme_location_no_menus to determine if no menus exist
  *
- * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
- * @return string Disabled attribute if at least one menu exists, false if not
- */
-function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+ * @param int|string $nav_menu_selected_id ID, name, or slug of the currently selected menu.
+ * @param bool       $echo                 Whether to echo or just return the string.
+ * @return string|false Disabled attribute if at least one menu exists, false if not.
+ */
+function wp_nav_menu_disabled_check( $nav_menu_selected_id, $echo = true ) {
     global $one_theme_location_no_menus;
 
@@ -272 +274 @@
     }
 
-    return disabled( $nav_menu_selected_id, 0 );
+    return disabled( $nav_menu_selected_id, 0, $echo );
 }
 
@@ -293 +295 @@
         <p id="menu-item-url-wrap" class="wp-clearfix">
             <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" placeholder="https://" />
+            <input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="code menu-item-textbox" placeholder="https://" />
         </p>
 
         <p id="menu-item-name-wrap" class="wp-clearfix">
             <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" />
+            <input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="regular-text menu-item-textbox" />
         </p>
 
@@ -570 +572 @@
             <p class="quick-search-wrap">
                 <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; ?>" />
+                <input type="search"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> 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' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
@@ -652 +654 @@
         <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" />
+                <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> 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>
             </span>
@@ -881 +883 @@
         <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" />
+                <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> 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>
             </span>