Changeset 33356

Timestamp:

07/22/2015 02:29:57 AM (11 years ago)

Author:

obenland

Message:

Site Icon: Create custom sizes for images that don't need cropping.

This will duplicate an image that doesn't need cropping once and will skip
creating new images and custom sizes if the selected image has the site-icon
context.

Fixes #33011.

Location:

trunk/src/wp-admin

Files:

• includes/ajax-actions.php (modified) (1 diff)
• js/customize-controls.js (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3081 +3081 @@
                         global $wp_site_icon;
 
+                        // Skip creating a new attachment if the attachment is a Site Icon.
+                        if ( get_post_meta( $attachment_id, '_wp_attachment_context', true ) == $context ) {
+
+                                // Delete the temporary cropped file, we don't need it.
+                                wp_delete_file( $cropped );
+
+                                // Additional sizes in wp_prepare_attachment_for_js().
+                                add_filter( 'image_size_names_choose', array( $wp_site_icon, 'additional_sizes' ) );
+                                break;
+                        }
+
                         /** This filter is documented in wp-admin/custom-header.php */
                         $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.

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

@@ -2077 +2077 @@
 
                 /**
+                 * After an image is selected in the media modal, switch to the cropper
+                 * state if the image isn't the right size.
+                 */
+                onSelect: function() {
+                        var attachment = this.frame.state().get( 'selection' ).first().toJSON(),
+                                controller = this;
+
+                        if ( this.params.width === attachment.width && this.params.height === attachment.height && ! this.params.flex_width && ! this.params.flex_height ) {
+                                wp.ajax.post( 'crop-image', {
+                                        nonce: attachment.nonces.edit,
+                                        id: attachment.id,
+                                        context: 'site-icon',
+                                        cropDetails: {
+                                                x1: 0,
+                                                y1: 0,
+                                                width: this.params.width,
+                                                height: this.params.height,
+                                                dst_width: this.params.width,
+                                                dst_height: this.params.height
+                                        }
+                                } ).done( function( croppedImage ) {
+                                        controller.setImageFromAttachment( croppedImage );
+                                        controller.frame.close();
+                                } ).fail( function() {
+                                        controller.trigger('content:error:crop');
+                                } );
+                        } else {
+                                this.frame.setState( 'cropper' );
+                        }
+                },
+
+                /**
                  * Updates the setting and re-renders the control UI.
                  *
@@ -2091 +2123 @@
 
                         // Update the icon in-browser.
-                        $( 'link[rel="icon"]' ).attr( 'href', icon.url );
+                        $( 'link[sizes="32x32"]' ).attr( 'href', icon.url );
                 },