Changeset 27845

Timestamp:

03/29/2014 09:08:16 AM (11 years ago)

Author:

nacin

Message:

Theme Installer: Avoid race condition during pagination.

props matveb.
see #27055.

File:

• trunk/src/wp-admin/js/theme.js (modified) (3 diffs)

trunk/src/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() {
@@ -332 +335 @@
             }
         });
-    }
+    },
+
+    // Static status controller for when we are loading themes.
+    loadingThemes: false
 });
 
@@ -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 );