Ticket #38365: 38365.diff

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

@@ -1079 +1079 @@
                 loading: false,
                 fullyLoaded: false,
                 term: '',
+                nextTerm: '',
                 filterContainer: $(),
 
                 /**
@@ -1411 +1412 @@
                         request.done(function( data ) {
                                 var themes = data.themes,
                                     themeControl, newThemeControls;
+
+                                // Stop and try again if the term changed.
+                                if ( section.nextTerm ) {
+                                        section.term = section.nextTerm;
+                                        section.nextTerm = '';
+                                        section.loading = false;
+                                        section.loadControls();
+                                        return;
+                                }
+
                                 if ( 0 !== themes.length ) {
                                         newThemeControls = [];
                                         // Add controls for each theme.
@@ -1545 +1556 @@
                         if ( '' !== newTerm ) { // Empty term should not show any results.
                                 // Run a new query, with loadControls handling paging, etc.
                                 section.term = newTerm;
-                                section.loadControls();
+                                if ( ! section.loading ) {
+                                        section.loadControls();
+                                } else {
+                                        section.nextTerm = newTerm; // This will reload with the newest term once the current batch is loaded.
+                                }
                                 if ( ! section.expanded() ) {
                                         section.expand(); // Expand the section if it isn't expanded.
                                 }