Ticket #27055: 27055.28.diff

wp-admin/js/theme.js

@@ -229 +229 @@
                         self = this,
                         query, isPaginated, count;
 
+                // Store current query request args
+                // for later use with the event `theme:end`
+                this.currentQuery.request = request;
+
                 // Search the query cache for matches.
                 query = _.find( queries, function( query ) {
                         return _.isEqual( query.request, request );
@@ -244 +248 @@
                 }
 
                 // Otherwise, send a new API call and add it to the cache.
-                if ( ! query ) {
+                if ( ! query && ! isPaginated ) {
                         query = this.apiCall( request ).done( function( data ) {
                                 // Update the collection with the queried data.
                                 self.reset( data.themes );
@@ -305 +309 @@
 
         // Send Ajax POST request to api.wordpress.org/themes
         apiCall: function( request, paginated ) {
-                // Store current query request args
-                // for later use with the event `theme:end`
-                this.currentQuery.request = request;
 
                 // Ajax request to .org API
                 return $.ajax({
@@ -1143 +1144 @@
                         request.tag = [ value.slice( 4 ) ];
                 }
 
+                $( '.theme-section.current' ).removeClass( 'current' );
+                $( 'body' ).removeClass( 'more-filters-opened filters-applied' );
+
                 // Get the themes by sending Ajax POST request to api.wordpress.org/themes
                 // or searching the local cache
                 this.collection.query( request );
@@ -1297 +1301 @@
                 }
 
                 $( 'body' ).addClass( 'filters-applied' );
+                $( '.theme-section.current' ).removeClass( 'current' );
                 filteringBy.empty();
 
                 _.each( tags, function( tag ) {