sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.


git-svn-id: https://develop.svn.wordpress.org/trunk@38889 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter 2016-10-24 19:14:26 +00:00
parent 71cbe11ee3
commit b5bc4fde53
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wp-admin/js/customize-controls.js
View File

@ -1186,7 +1186,7 @@
// 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() {
@ -1735,7 +1735,7 @@
* @param {Object} theme
*/
showDetails: function ( theme, callback ) {
var section = this, link;
var section = this;
callback = callback || function(){};
section.currentTheme = theme.id;
section.overlay.html( section.template( theme ) )
@ -1745,21 +1745,6 @@
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();
},

4
src/wp-includes/customize/class-wp-customize-theme-control.php
View File

@ -106,13 +106,13 @@ class WP_Customize_Theme_Control extends WP_Customize_Control {
<# } 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>