Ticket #38475: 38475.diff

src/wp-admin/js/customize-controls.js

@@ -1186 +1186 @@
 
                         // Preview installed themes.
                         section.container.on( 'click', '.theme-actions .preview-theme', function() {
-                                var themeId = $( this ).data( 'themeId' );
+                                var themeId = $( this ).data( 'slug' );
 
                                 $( '.wp-full-overlay' ).addClass( 'customize-loading' );
                                 api.panel( 'themes' ).loadThemePreview( themeId ).fail( function() {
@@ -1745 +1745 @@
                         section.containFocus( section.overlay );
                         section.updateLimits();
                         wp.a11y.speak( api.settings.l10n.announceThemeDetails.replace( '%s', theme.name ) );
-
-                        link = section.overlay.find( '.inactive-theme > a' );
-                        link.on( 'click', function( event ) {
-                                event.preventDefault();
-
-                                // Short-circuit if request is currently being made.
-                                if ( link.hasClass( 'disabled' ) ) {
-                                        return;
-                                }
-                                link.addClass( 'disabled' );
-
-                                api.panel( 'themes' ).loadThemePreview( theme.id ).fail( function() {
-                                        link.removeClass( 'disabled' );
-                                } );
-                        } );
                         callback();
                 },
 

src/wp-includes/customize/class-wp-customize-theme-control.php

@@ -106 +106 @@
                         <# } else if ( 'installed' === data.theme.type ) { #>
                                 <h3 class="theme-name" id="{{ data.section }}-{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
                                 <div class="theme-actions">
-                                        <button type="button" class="button button-primary preview-theme" aria-label="<?php echo esc_attr( $preview_label ); ?>" data-theme-id="{{ data.theme.id }}"><?php _e( 'Live Preview' ); ?></span>
+                                        <button type="button" class="button button-primary preview-theme" aria-label="<?php echo esc_attr( $preview_label ); ?>" data-slug="{{ data.theme.id }}"><?php _e( 'Live Preview' ); ?></span>
                                 </div>
                                 <div class="notice notice-success notice-alt"><p><?php _e( 'Installed' ); ?></p></div>
                         <# } else { #>
                                 <h3 class="theme-name" id="{{ data.section }}-{{ data.theme.id }}-name">{{ data.theme.name }}</h3>
                                 <div class="theme-actions">
-                                        <button type="button" class="button button-primary theme-install preview" aria-label="<?php echo esc_attr( $install_label ); ?>" data-slug="{{ data.theme.id }}" data-name="{{ data.theme.name }}" data-theme-id="{{ data.theme.id }}"><?php _e( 'Install & Preview' ); ?></button>
+                                        <button type="button" class="button button-primary theme-install preview" aria-label="<?php echo esc_attr( $install_label ); ?>" data-slug="{{ data.theme.id }}" data-name="{{ data.theme.name }}"><?php _e( 'Install & Preview' ); ?></button>
                                 </div>
                         <# } #>
                 </div>