Changeset 36851

Timestamp:

03/04/2016 11:46:07 PM (9 years ago)

Author:

westonruter

Message:

Customize: Eliminate unnecessary WP_Customize_Site_Logo_Control in favor of re-using WP_Customize_Image_Control.

• Removes double margin-bottom from all the media controls.
• All media controls now send {settingId}-attachment-data messages to the preview when a media setting is updated so that the preview has access to the attachment data.
• Fixes receiving of attachment-data message for custom_logo which resulted in instant JS-applied preview not working. See #36096.

See #33755.
Fixes #35941.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (10 diffs)
• wp-admin/js/customize-controls.js (modified) (3 diffs)
• wp-includes/class-wp-customize-manager.php (modified) (3 diffs)
• wp-includes/customize/class-wp-customize-custom-logo-control.php (deleted)
• wp-includes/js/customize-preview.js (modified) (1 diff)

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

@@ -722 +722 @@
 .customize-control-cropped_image .current,
 .customize-control-site_icon .current,
-.customize-control-custom_logo .current,
 .customize-control-header .current {
     margin-bottom: 8px;
@@ -764 +763 @@
 .customize-control-site_icon .default-button,
 .customize-control-site_icon .upload-button,
-.customize-control-custom_logo .remove-button,
-.customize-control-custom_logo .default-button,
-.customize-control-custom_logo .upload-button,
 .customize-control-header button.new,
 .customize-control-header button.remove {
@@ -780 +776 @@
 .customize-control-cropped_image .current .container,
 .customize-control-site_icon .current .container,
-.customize-control-custom_logo .current .container,
 .customize-control-header .current .container {
     overflow: hidden;
@@ -794 +789 @@
 .customize-control-cropped_image .current .container,
 .customize-control-site_icon .current .container,
-.customize-control-custom_logo .current .container,
 .customize-control-image .current .container {
     min-height: 40px;
@@ -823 +817 @@
 .customize-control-cropped_image .inner,
 .customize-control-site_icon .inner,
-.customize-control-custom_logo .inner,
 .customize-control-header .inner {
     display: none;
@@ -839 +832 @@
 .customize-control-cropped_image .inner,
 .customize-control-site_icon .inner,
-.customize-control-custom_logo .inner,
 .customize-control-image .inner {
     display: block;
@@ -851 +843 @@
 .customize-control-cropped_image .inner,
 .customize-control-site_icon .inner,
-.customize-control-custom_logo.inner,
 .customize-control-header .inner,
 .customize-control-header .inner .dashicons {
@@ -951 +942 @@
 }
 
-.customize-control-media .actions,
-.customize-control-upload .actions,
-.customize-control-image .actions,
-.customize-control-background .actions,
-.customize-control-cropped_image .actions,
-.customize-control-site_icon .actions,
-.customize-control-header .actions {
-    margin-bottom: 32px;
-}
-
 .customize-control-header .choice {
     position: relative;
@@ -995 +976 @@
 .customize-control-site_icon .remove-button,
 .customize-control-site_icon .default-button,
-.customize-control-custom_logo .remove-button,
-.customize-control-custom_logo .default-button,
 .customize-control-header .remove {
     float: left;
@@ -1008 +987 @@
 .customize-control-cropped_image .upload-button,
 .customize-control-site_icon .upload-button,
-.customize-control-custom_logo .upload-button,
 .customize-control-header .new {
     float: right;

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

@@ -1791 +1791 @@
                 });
 
-            // Re-render whenever the control's setting changes.
-            control.setting.bind( function () { control.renderContent(); } );
+            control.setting.bind( function( value ) {
+
+                // Send attachment information to the preview for possible use in `postMessage` transport.
+                wp.media.attachment( value ).fetch().done( function() {
+                    wp.customize.previewer.send( control.setting.id + '-attachment-data', this.attributes );
+                } );
+
+                // Re-render whenever the control's setting changes.
+                control.renderContent();
+            } );
         },
 
@@ -2304 +2312 @@
 
     /**
-     * A control for selecting custom logos.
-     *
-     * @class
-     * @augments wp.customize.MediaControl
-     * @augments wp.customize.Control
-     * @augments wp.customize.Class
-     */
-    api.CustomLogoControl = api.MediaControl.extend({
-
-        /**
-         * When the control's DOM structure is ready,
-         * set up internal event bindings.
-         */
-        ready: function() {
-            var control = this;
-
-            // Shortcut so that we don't have to use _.bind every time we add a callback.
-            _.bindAll( control, 'restoreDefault', 'removeFile', 'openFrame', 'select' );
-
-            // Bind events, with delegation to facilitate re-rendering.
-            control.container.on( 'click keydown', '.upload-button', control.openFrame );
-            control.container.on( 'click keydown', '.thumbnail-image img', control.openFrame );
-            control.container.on( 'click keydown', '.default-button', control.restoreDefault );
-            control.container.on( 'click keydown', '.remove-button', control.removeFile );
-
-            control.setting.bind( function( attachmentId ) {
-                wp.media.attachment( attachmentId ).fetch().done( function() {
-                    wp.customize.previewer.send( 'custom-logo-attachment-data', this.attributes );
-                } );
-
-                // Re-render whenever the control's setting changes.
-                control.renderContent();
-            } );
-        }
-    });
-
-    /**
      * @class
      * @augments wp.customize.Control
@@ -3246 +3217 @@
         cropped_image: api.CroppedImageControl,
         site_icon:     api.SiteIconControl,
-        custom_logo:   api.CustomLogoControl,
         header:        api.HeaderControl,
         background:    api.BackgroundControl,

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -218 +218 @@
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
-        require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-logo-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
         require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
@@ -1849 +1848 @@
         $this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
         $this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-        $this->register_control_type( 'WP_Customize_Custom_Logo_Control' );
         $this->register_control_type( 'WP_Customize_Theme_Control' );
 
@@ -1966 +1964 @@
         ) );
 
-        $this->add_control( new WP_Customize_Custom_Logo_Control( $this, 'custom_logo', array(
+        $this->add_control( new WP_Customize_Media_Control( $this, 'custom_logo', array(
             'label'    => __( 'Logo' ),
             'section'  => 'title_tagline',
             'priority' => 0,
+            'mime_type' => 'image',
+            'button_labels' => array(
+                'select'       => __( 'Select logo' ),
+                'change'       => __( 'Change logo' ),
+                'remove'       => __( 'Remove' ),
+                'default'      => __( 'Default' ),
+                'placeholder'  => __( 'No logo selected' ),
+                'frame_title'  => __( 'Select logo' ),
+                'frame_button' => __( 'Choose logo' ),
+            ),
         ) ) );
 

trunk/src/wp-includes/js/customize-preview.js

@@ -235 +235 @@
          * @since 4.5.0
          */
-        api.preview.bind( 'custom-logo-attachment-data', function( attachment ) {
+        api.preview.bind( 'custom_logo-attachment-data', function( attachment ) {
             var $logo  = $( '.custom-logo' ),
                 size   = $logo.data( 'size' ),