Changeset 34056

Timestamp:

09/11/2015 08:12:50 PM (10 years ago)

Author:

ocean90

Message:

Site Icon: For preview fall back to full size URL when thumbnail size doesn't exist.

Prevents a JavaScript error for rare cases when cropping is skipped and the image is smaller than thumbnail.

Props tyxla.
Fixes #33417.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (2 diffs)

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

@@ -2183 +2183 @@
          */
         setImageFromAttachment: function( attachment ) {
-            var icon = typeof attachment.sizes['site_icon-32'] !== 'undefined' ? attachment.sizes['site_icon-32'] : attachment.sizes.thumbnail;
+            var sizes = [ 'site_icon-32', 'thumbnail', 'full' ],
+                icon;
+
+            _.each( sizes, function( size ) {
+                if ( ! icon && ! _.isUndefined ( attachment.sizes[ size ] ) ) {
+                    icon = attachment.sizes[ size ];
+                }
+            } );
 
             this.params.attachment = attachment;
@@ -2189 +2196 @@
             // Set the Customizer setting; the callback takes care of rendering.
             this.setting( attachment.id );
-
 
             // Update the icon in-browser.