Ticket #35576: 35576.2.diff

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

@@ -27 +27 @@
         margin-bottom: 0;
 }
 
+.has-no-menu-item .button-controls {
+        display: none;
+}
+
 #nav-menus-frame {
         margin-left: 300px;
         margin-top: 23px;

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

@@ -568 +568 @@
                                                 ),
                                                 remove_query_arg( $removed_args )
                                         ));
-                                ?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
+                                ?>#posttype-<?php echo $post_type_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
                         </span>
 
                         <span class="add-to-menu">
@@ -766 +766 @@
                                                 ),
                                                 remove_query_arg($removed_args)
                                         ));
-                                ?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
+                                ?>#taxonomy-<?php echo $taxonomy_name; ?>" class="select-all aria-button-if-js"><?php _e( 'Select All' ); ?></a>
                         </span>
 
                         <span class="add-to-menu">

src/wp-admin/js/nav-menu.js

@@ -1060 +1060 @@
                                         // select the search bar
                                         $('.quick-search', wrapper).focus();
 
+                                        // Hide controls in the search tab if no items found.
+                                        if ( ! wrapper.find( '.tabs-panel-active .menu-item-title' ).length ) {
+                                                wrapper.addClass( 'has-no-menu-item' );
+                                        } else {
+                                                wrapper.removeClass( 'has-no-menu-item' );
+                                        }
+
                                         e.preventDefault();
                                 } else if ( target.hasClass('select-all') ) {
                                         selectAreaMatch = /#(.*)$/.exec(e.target.href);
@@ -1192 +1199 @@
                         form = document.getElementById('nav-menu-meta'),
                         pattern = /menu-item[(\[^]\]*/,
                         $items = $('<div>').html(resp).find('li'),
+                        wrapper = panel.closest( '.accordion-section-content' ),
                         $item;
 
                         if( ! $items.length ) {
                                 $('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
                                 $( '.spinner', panel ).removeClass( 'is-active' );
+                                wrapper.addClass( 'has-no-menu-item' );
                                 return;
                         }
 
@@ -1224 +1233 @@
 
                         $('.categorychecklist', panel).html( $items );
                         $( '.spinner', panel ).removeClass( 'is-active' );
+                        wrapper.removeClass( 'has-no-menu-item' );
                 },
 
                 removeMenuItem : function(el) {