Changeset 40824

Timestamp:

05/23/2017 08:32:00 PM (9 years ago)

Author:

adamsilverstein

Message:

Themes: improve browser history support on new themes page.

When closing the theme preview, restore the previously selected tab. Avoid an issue where duplicate entries in the history prevented navigation. When re-opening the preview, remove bound event handlers before re-adding them.

Props afercia.
Fixes #36613.

File:

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

trunk/src/wp-admin/js/theme.js

@@ -493 +493 @@
 
                 // Construct a new Preview view.
-                themes.currentPreview = preview = new themes.view.Preview({
+                themes.preview = preview = new themes.view.Preview({
                         model: this.model
                 });
@@ -574 +574 @@
                 });
 
-                // Listen for closepreview events, closing the preview.
-                this.listenTo( preview, 'closepreview', function() {
-                        preview.close();
-                });
         },
 
@@ -917 +913 @@
                 }).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();
@@ -1652 +1654 @@
                 this.clearSearch();
 
+                // Track sorting so we can restore the correct tab when closing preview.
+                themes.router.selectedTab = sort;
+
                 $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
                 $( '[data-sort="' + sort + '"]' ).addClass( this.activeClass );
@@ -1915 +1920 @@
                 themes.router.on( 'route:preview', function( slug ) {
 
+                        // Remove existing handlers.
+                        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 ) {
@@ -1940 +1951 @@
                         if ( ! sort ) {
                                 sort = 'featured';
+                                themes.router.navigate( themes.router.baseUrl( '?browse=featured' ), { replace: true } );
                         }
                         self.view.sort( sort );
 
                         // Close the preview if open.
-                        if ( themes.currentPreview ) {
-                                themes.currentPreview.trigger( 'closepreview' );
+                        if ( themes.preview ) {
+                                themes.preview.close();
                         }
                 });