Changeset 37724

Timestamp:

06/16/2016 09:44:21 AM (7 years ago)

Author:

ocean90

Message:

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.

File:

• trunk/src/wp-includes/customize/class-wp-customize-site-icon-control.php (modified) (1 diff)

trunk/src/wp-includes/customize/class-wp-customize-site-icon-control.php

@@ -60 +60 @@
         </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 ) { #>