Customize: Separate preview and actions in the site icon control.

Reverts [37456] to allow users to remove/change a site icon even if the attachment has corrupt/missing data about sizes.

Fixes #36749.

git-svn-id: https://develop.svn.wordpress.org/trunk@37724 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2016-06-16 09:44:21 +00:00
parent 62bd8ecdd7
commit f50f50cd0b
1 changed files with 11 additions and 9 deletions

View File

@ -59,19 +59,21 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
<# } #>
</label>
<# if ( data.attachment && data.attachment.id && data.attachment.sizes ) { #>
<# if ( data.attachment && data.attachment.id ) { #>
<div class="attachment-media-view">
<div class="site-icon-preview">
<div class="favicon-preview">
<img src="<?php echo esc_url( admin_url( 'images/browser.png' ) ); ?>" class="browser-preview" width="182" alt="" />
<# if ( data.attachment.sizes ) { #>
<div class="site-icon-preview">
<div class="favicon-preview">
<img src="<?php echo esc_url( admin_url( 'images/browser.png' ) ); ?>" class="browser-preview" width="182" alt="" />
<div class="favicon">
<img id="preview-favicon" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
<div class="favicon">
<img id="preview-favicon" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
</div>
<span class="browser-title" aria-hidden="true"><?php bloginfo( 'name' ); ?></span>
</div>
<span class="browser-title" aria-hidden="true"><?php bloginfo( 'name' ); ?></span>
<img class="app-icon-preview" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
</div>
<img class="app-icon-preview" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
</div>
<# } #>
<div class="actions">
<# if ( data.canUpload ) { #>
<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>