Ticket #27055: 27055.29.diff

wp-admin/css/themes.css

@@ -1288 +1288 @@
         margin: 0 5px;
         padding: 4px 8px;
 }
+.more-filters-container .filtering-by a {
+        margin-left: 10px;
+}
 body.filters-applied .more-filters-container .filters-group,
-body.filters-applied .more-filters-container a,
+body.filters-applied .more-filters-container a.button,
 body.filters-applied .more-filters-container br {
         display: none !important;
 }

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 );
@@ -1161 +1165 @@
                 'click .apply-filters': 'addFilter',
                 'click [type="checkbox"]': 'filtersChecked',
                 'click .clear-filters': 'clearFilters',
-                'click .feature-name': 'filterSection'
+                'click .feature-name': 'filterSection',
+                'click .filtering-by a': 'backToFilters'
         },
 
         // Handles all the rendering of the public theme directory
@@ -1297 +1302 @@
                 }
 
                 $( 'body' ).addClass( 'filters-applied' );
+                $( '.theme-section.current' ).removeClass( 'current' );
                 filteringBy.empty();
 
                 _.each( tags, function( tag ) {
@@ -1355 +1361 @@
                 event.preventDefault();
 
                 if ( $( 'body' ).hasClass( 'filters-applied' ) ) {
-                        return $( 'body' ).removeClass( 'filters-applied' );
+                        return this.backToFilters();
                 }
 
                 // If the filters section is opened and filters are checked
@@ -1384 +1390 @@
                         $( item ).prop( 'checked', false );
                         return self.filtersChecked();
                 });
+        },
+
+        backToFilters: function() {
+                $( 'body' ).removeClass( 'filters-applied' );
         }
 });
 

wp-admin/theme-install.php

@@ -145 +145 @@
                         <div class="filtering-by">
                                 <span><?php _e( 'Filtering by:' ); ?></span>
                                 <div class="tags"></div>
+                                <a href="#"><?php _e( 'Edit' ); ?></a>
                         </div>
                 </div>
         </div>