Ticket #27055: 27055.19.diff

wp-admin/js/theme.js

@@ -269 +269 @@
                                         self.add( data.themes );
                                         self.trigger( 'query:success' );
 
+                                        // We are done loading themes for now.
+                                        self.loadingThemes = false;
+
                                 }).fail( function() {
                                         self.trigger( 'query:fail' );
                                 });
@@ -331 +334 @@
                                 }
                         }
                 });
-        }
+        },
+
+        // Static status controller for when we are loading themes.
+        loadingThemes: false
 });
 
 // This is the view that controls each theme item
@@ -1149 +1155 @@
 
                 // Bump `collection.currentQuery.page` and request more themes if we hit the end of the page.
                 this.listenTo( this, 'theme:end', function() {
+
+                        // Make sure we are not already loading
+                        if ( self.collection.loadingThemes ) {
+                                return;
+                        }
+
+                        // Set loadingThemes to true and bump page instance of currentQuery.
+                        self.collection.loadingThemes = true;
                         self.collection.currentQuery.page++;
+
+                        // Use currentQuery.page to build the themes request.
                         _.extend( self.collection.currentQuery.request, { page: self.collection.currentQuery.page } );
                         self.collection.query( self.collection.currentQuery.request );
                 });