Ticket #36613: 36613.7.diff

src/wp-admin/js/theme.js

@@ -491 +491 @@
                 // Set focus to current theme.
                 themes.focusedTheme = this.$el;
 
-                // Construct a new Preview view.
-                themes.currentPreview = preview = new themes.view.Preview({
+                themes.preview = preview = new themes.view.Preview({
                         model: this.model
                 });
 
@@ -573 +572 @@
                         self.current = self.model;
                 });
 
-                // Listen for closepreview events, closing the preview.
-                this.listenTo( preview, 'closepreview', function() {
-                        preview.close();
-                });
         },
 
         // Handles .disabled classes for previous/next buttons in theme installer preview
@@ -916 +911 @@
                         }
                 }).removeClass( 'iframe-ready' );
 
-                themes.router.navigate( themes.router.baseUrl( '' ) );
+                // Restore the previous browse tab if available.
+                if ( themes.router.selectedTab ) {
+                        themes.router.navigate( themes.router.baseUrl( '?browse=' + themes.router.selectedTab ) );
+                        themes.router.selectedTab = false;
+                } else {
+                        themes.router.navigate( themes.router.baseUrl( '' ) );
+                }
                 this.trigger( 'preview:close' );
                 this.undelegateEvents();
                 this.unbind();
@@ -1651 +1652 @@
         sort: function( sort ) {
                 this.clearSearch();
 
+                // Track sorting so we can restore the correct tab when closing preview.
+                themes.router.selectedTab = 'featured' === sort ? '' : sort;
+
                 $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
                 $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
 
@@ -1914 +1918 @@
                 // Queries the API for the passed theme slug
                 themes.router.on( 'route:preview', function( slug ) {
 
+                        // Construct a new Preview view.
+                        if ( themes.preview ) {
+                                themes.preview.undelegateEvents();
+                                themes.preview.unbind();
+                        }
+
                         // If the theme preview is active, set the current theme.
                         if ( self.view.view.theme && self.view.view.theme.preview ) {
                                 self.view.view.theme.model = self.view.collection.findWhere( { 'slug': slug } );
@@ -1943 +1953 @@
                         self.view.sort( sort );
 
                         // Close the preview if open.
-                        if ( themes.currentPreview ) {
-                                themes.currentPreview.trigger( 'closepreview' );
+                        if ( themes.preview ) {
+                                themes.preview.close();
                         }
                 });