Changeset 30849

Timestamp:

12/14/2014 07:36:27 PM (10 years ago)

Author:

ocean90

Message:

Customizer: Re-add the possibility to remove and restore a default background image.

see #21483.
fixes #30683 for trunk.

Location:

trunk/src

Files:

• wp-admin/css/customize-controls.css (modified) (2 diffs)
• wp-includes/class-wp-customize-control.php (modified) (5 diffs)

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

@@ -606 +606 @@
 
 .customize-control-upload .remove-button,
+.customize-control-upload .default-button,
 .customize-control-upload .upload-button,
 .customize-control-image .remove-button,
+.customize-control-image .default-button,
 .customize-control-image .upload-button,
 .customize-control-header button.new,
@@ -798 +800 @@
 }
 
-.customize-control-upload .remove-button
-.customize-control-image .remove-button
+.customize-control-upload .remove-button,
+.customize-control-upload .default-button,
+.customize-control-image .remove-button,
+.customize-control-image .default-button,
 .customize-control-header .remove {
     float: left;

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

@@ -688 +688 @@
         $this->json['button_labels'] = $this->button_labels;
 
+        $value = $this->value();
+
         if ( is_object( $this->setting ) ) {
             if ( $this->setting->default ) {
@@ -696 +698 @@
                     'url' => $this->setting->default,
                     'type' => $type,
-                    'sizes' => array(
-                        'full' => array( 'url' => $this->setting->default ),
-                    ),
                     'icon' => wp_mime_type_icon( $type ),
                     'title' => basename( $this->setting->default ),
                 );
+
+                if ( 'image' === $type ) {
+                    $default_attachment['sizes'] = array(
+                        'full' => array( 'url' => $this->setting->default ),
+                    );
+                }
+
                 $this->json['defaultAttachment'] = $default_attachment;
             }
 
-            // Get the attachment model for the existing file.
-            if ( $this->value() ) {
-                $attachment_id = attachment_url_to_postid( $this->value() );
+            if ( $value && $this->setting->default && $value === $this->setting->default ) {
+                // Set the default as the attachment.
+                $this->json['attachment'] = $this->json['defaultAttachment'];
+            } elseif ( $value ) {
+                // Get the attachment model for the existing file.
+                $attachment_id = attachment_url_to_postid( $value );
                 if ( $attachment_id ) {
-                    $this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id);
+                    $this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id );
                 }
-            } else if ( $this->setting->default ) {
-                // Set the default as the attachment.
-                $this->json['attachment'] = $default_attachment;
             }
         }
@@ -742 +748 @@
         </label>
 
-        <# // Ensure that the default attachment is used if it exists.
-        if ( _.isEmpty( data.attachment ) && data.defaultAttachment ) {
-            data.attachment = data.defaultAttachment;
-        }
-
-        if ( data.attachment && data.attachment.id ) { #>
+        <# if ( data.attachment && data.attachment.id ) { #>
             <div class="current">
                 <div class="container">
@@ -774 +775 @@
             </div>
             <div class="actions">
-                <# if ( data.defaultAttachment && data.defaultAttachment.id !== data.attachment.id ) { #>
-                    <button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
-                <# } else if ( ! data.defaultAttachment ) { #>
-                    <button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
-                <# } #>
+                <button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
                 <button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['change']; ?></button>
                 <div style="clear:both"></div>
@@ -796 +793 @@
             <div class="actions">
                 <# if ( data.defaultAttachment ) { #>
-                    <button type="button" class="button default-button remove-button"><?php echo $this->button_labels['default']; ?></button>
+                    <button type="button" class="button default-button"><?php echo $this->button_labels['default']; ?></button>
                 <# } #>
                 <button type="button" class="button upload-button" id="{{ data.settings.default }}-button"><?php echo $this->button_labels['select']; ?></button>