Changeset 21724

Timestamp:

09/04/2012 04:54:01 AM (12 years ago)

Author:

nacin

Message:

Remove custom header uploads from the customizer.

For the 3.4 branch. It will return when crop ability is added.

props koopersmith.
see #21355. fixes #21515. fixes #21707.
merges [21379] [21380] [21383] [21385] [21386] [21497] [21722].

Location:

branches/3.4

Files:

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

branches/3.4/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();

branches/3.4/wp-includes/class-wp-customize-control.php

@@ -322 +322 @@
         $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.2
+     */
+    public function prepare_control() {
+        if ( ! $this->tabs )
+            $this->manager->remove_control( $this->id );
     }
 
@@ -456 +471 @@
 
 class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
+    /**
+     * The processed default headers.
+     * @since 3.4.2
+     * @var array
+     */
+    protected $default_headers;
+
+    /**
+     * The uploaded headers.
+     * @since 3.4.2
+     * @var array
+     */
+    protected $uploaded_headers;
+
     public function __construct( $manager ) {
         parent::__construct( $manager, 'header_image', array(
@@ -475 +504 @@
         ) );
 
-        $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.2
+     */
+    public function prepare_control() {
+        global $custom_image_header;
+        if ( empty( $custom_image_header ) )
+            return parent::prepare_control();
+
+        // 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();
     }
 
@@ -499 +555 @@
 
     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 );
     }
 
     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 );
     }

branches/3.4/wp-includes/js/plupload/wp-plupload.dev.js

@@ -74 +74 @@
         }
 
+        // If the uploader has neither a browse button nor a dropzone, bail.
+        if ( ! ( this.browser && this.browser.length ) && ! ( this.dropzone && this.dropzone.length ) )
+            return;
+
         this.uploader = new plupload.Uploader( this.plupload );
         delete this.plupload;
@@ -114 +118 @@
         }( this.dropzone, this.supports.dragdrop ));
 
-        this.browser.on( 'mouseenter', this.refresh );
+        if ( this.browser ) {
+            this.browser.on( 'mouseenter', this.refresh );
+        } else {
+            this.uploader.disableBrowse( true );
+            // If HTML5 mode, hide the auto-created file container.
+            $('#' + this.uploader.id + '_html5_container').hide();
+        }
 
         this.uploader.bind( 'UploadProgress', this.progress );