Ticket #62681: 62681.patch

src/js/_enqueues/wp/customize/controls.js

@@ -2105 +2105 @@
                         request.done(function( data ) {
                                 var themes = data.themes;
 
+                                if ( section.tagEmpty ) {
+                                        section.tagEmpty = false;
+                                        section.loading = false;
+                                        section.tags = '';
+                                        section.loadThemes();
+                                        return;
+                                }
                                 // Stop and try again if the term changed while loading.
                                 if ( '' !== section.nextTerm || '' !== section.nextTags ) {
                                         if ( section.nextTerm ) {
@@ -2324 +2331 @@
                         if ( ! _.isEqual( section.tags, tags ) ) {
                                 if ( section.loading ) {
                                         section.nextTags = tags;
+                                        if ( 0 === tags.length ) {
+                                                section.tagEmpty = true;
+                                        }
                                 } else {
                                         if ( 'remote' === section.params.filter_type ) {
                                                 section.initializeNewQuery( section.term, tags );
@@ -2361 +2371 @@
                                 section.tags = newTags;
                                 section.loadThemes();
                         } else {
+                                section.tagEmpty = true;
                                 section.nextTerm = newTerm; // This will reload from loadThemes() with the newest term once the current batch is loaded.
                                 section.nextTags = newTags; // This will reload from loadThemes() with the newest tags once the current batch is loaded.
                         }