Changeset 38889

Timestamp:

10/24/2016 07:14:26 PM (8 years ago)

Author:

westonruter

Message:

Customize: Fix live preview button in theme details modal so it includes target theme.

Fixes issue introduced in [38813].

Props celloexpressions.
See #37661.
Fixes #38475.

Location:

trunk/src

Files:

• wp-admin/js/customize-controls.js (modified) (3 diffs)
• wp-includes/customize/class-wp-customize-theme-control.php (modified) (2 diffs)

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

@@ -1187 +1187 @@
             // 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' );
@@ -1736 +1736 @@
          */
         showDetails: function ( theme, callback ) {
-            var section = this, link;
+            var section = this;
             callback = callback || function(){};
             section.currentTheme = theme.id;
@@ -1746 +1746 @@
             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();
         },

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

@@ -107 +107 @@
                 <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>
@@ -113 +113 @@
                 <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>
             <# } #>