Changeset 21383

Timestamp:

08/01/2012 06:45:54 AM (12 years ago)

Author:

koopersmith

Message:

Remove the ability to upload custom headers in the customizer. Properly handle selecting the correct first tab, and removing the control/section if no tabs exist. see #21355.

To check if the control has any potential tabs and headers, added:

• WP_Customize_Image_Control->prepare_control()
• WP_Customize_Header_Image_Control->prepare_control()
• WP_Customize_Header_Image_Control->default_headers
• WP_Customize_Header_Image_Control->uploaded_headers

Location:

trunk

Files:

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

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

@@ -221 +221 @@
             });
 
-            // Select a tab
-            this.selected = this.tabs[ panels.first().data('customizeTab') ];
-            this.selected.both.addClass('library-selected');
-
             // Bind tab switch events
             this.library.children('ul').on( 'click', 'li', function( event ) {
@@ -255 +251 @@
                     this.tabs.uploaded.both.addClass('hidden');
             }
+
+            // Select a tab
+            panels.each( function() {
+                var tab = control.tabs[ $(this).data('customizeTab') ];
+
+                // Select the first visible tab.
+                if ( ! tab.link.hasClass('hidden') ) {
+                    control.selected = tab;
+                    tab.both.addClass('library-selected');
+                    return false;
+                }
+            });
 
             this.dropdownInit();

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

@@ -478 +478 @@
         $this->add_tab( 'upload-new', __('Upload New'), array( $this, 'tab_upload_new' ) );
         $this->add_tab( 'uploaded',   __('Uploaded'),   array( $this, 'tab_uploaded' ) );
+
+        // Early priority to occur before $this->manager->prepare_controls();
+        add_action( 'customize_controls_init', array( $this, 'prepare_control' ), 5 );
+    }
+
+    /**
+     * Prepares the control.
+     *
+     * If no tabs exist, removes the control from the manager.
+     *
+     * @since 3.4.1
+     */
+    public function prepare_control() {
+        if ( ! $this->tabs )
+            $this->manager->remove_control( $this->id );
     }
 
@@ -681 +696 @@
  */
 class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
+    /**
+     * The processed default headers.
+     * @var array
+     */
+    protected $default_headers;
+
+    /**
+     * The uploaded headers.
+     * @var array
+     */
+    protected $uploaded_headers;
 
     /**
@@ -710 +736 @@
         ) );
 
-        $this->add_tab( 'default',  __('Default'),  array( $this, 'tab_default_headers' ) );
+        // Remove the upload tab.
+        $this->remove_tab( 'upload-new' );
+    }
+
+    /**
+     * Prepares the control.
+     *
+     * If no tabs exist, removes the control from the manager.
+     *
+     * @since 3.4.1
+     */
+    public function prepare_control() {
+        global $custom_image_header;
+
+        // Process default headers and uploaded headers.
+        $custom_image_header->process_default_headers();
+        $this->default_headers = $custom_image_header->default_headers;
+        $this->uploaded_headers = get_uploaded_header_images();
+
+        if ( $this->default_headers )
+            $this->add_tab( 'default',  __('Default'),  array( $this, 'tab_default_headers' ) );
+
+        if ( ! $this->uploaded_headers )
+            $this->remove_tab( 'uploaded' );
+
+        return parent::prepare_control();
     }
 
@@ -743 +794 @@
      */
     public function tab_uploaded() {
-        $headers = get_uploaded_header_images();
-
         ?><div class="uploaded-target"></div><?php
 
-        foreach ( $headers as $choice => $header )
+        foreach ( $this->uploaded_headers as $choice => $header )
             $this->print_header_image( $choice, $header );
     }
@@ -755 +804 @@
      */
     public function tab_default_headers() {
-        global $custom_image_header;
-        $custom_image_header->process_default_headers();
-
-        foreach ( $custom_image_header->default_headers as $choice => $header )
+        foreach ( $this->default_headers as $choice => $header )
             $this->print_header_image( $choice, $header );
     }