Ticket #38663: 38663.diff

src/wp-admin/js/customize-controls.js

@@ -1173 +1173 @@
 
                         // Expand section/panel. Only collapse when opening another section.
                         section.filterContainer.on( 'click', '.customize-themes-section-title', function() {
-                                // Open the section.
-                                if ( ! section.expanded() ) {
-                                        section.expand();
-                                }
 
                                 // Toggle filters.
                                 if ( section.filterContainer.find( '.filter-details' ).length ) {
@@ -1187 +1183 @@
                                                 });
                                         section.filterContainer.find( '.filter-details' ).slideToggle( 180 );
                                 }
+
+                                // Open the section.
+                                if ( ! section.expanded() ) {
+
+                                        // Don't expand if there's nothing to show.
+                                        if ( -1 !== $.inArray( section.params.action, [ 'search', 'favorites', 'feature_filter' ] ) && '' === section.term ) {
+                                                return;
+                                        } else {
+                                                section.expand();
+                                        }
+                                }
                         });
 
                         // Preview installed themes.
@@ -1248 +1255 @@
                                         }
                                 });
                         } else if ( 'favorites' === section.params.action ) {
+                                section.checkTerm( section ); // Expand the section if there's already a term.
                                 section.container.on( 'click', '.favorites-form-submit', function() {
                                         section.checkTerm( section );
                                 });
@@ -1258 +1266 @@
                                         section.checkTerm( section );
                                 });
                         } else if ( 'feature_filter' === section.params.action ) {
+                                section.checkTerm( section ); // Expand the section if there's already a term.
                                 section.container.on( 'click', '.filter-group input', function() {
                                         section.filtersChecked();
                                         section.checkTerm( section );