Changeset 34057

Timestamp:

09/11/2015 08:15:41 PM (11 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.

Merge of [34056] to the 4.3 branch.

Props tyxla.
See #33417.

File:

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

branches/4.3/src/wp-admin/js/customize-controls.js

@@ -2164 +2164 @@
                  */
                 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;
@@ -2170 +2177 @@
                         // Set the Customizer setting; the callback takes care of rendering.
                         this.setting( attachment.id );
-
 
                         // Update the icon in-browser.