Ticket #21483: 21483.wip.2.diff

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

@@ -10 +10 @@
         font-size: 14px;
 }
 
+#customize-controls img {
+        max-width: 100%;
+}
+
 #customize-controls .submit {
         text-align: center;
 }
@@ -414 +418 @@
         margin-right: 5px;
 }
 
+.customize-control .attachment-thumb.type-icon {
+        float: left;
+        margin-right: 12px;
+}
+
+.customize-control .attachment-title {
+        font-weight: bold;
+        margin: 0 0 12px 0;
+}
+
+.customize-control .remove-button {
+        margin-left: 8px;
+        vertical-align: middle;
+}
+
 #customize-preview iframe {
         width: 100%;
         height: 100%;

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

@@ -200 +200 @@
          * @augments wp.customize.Class
          */
         api.UploadControl = api.Control.extend({
+
+                /**
+                 * Setup control and do event bindings.
+                 */
                 ready: function() {
-                        var control = this;
+                        
+                        // Cache buttons for re-use.
+                        this.$button = this.container.find( '.upload-button' );
+                        this.$img = this.container.find( '.thumbnail-image img' );
+                        this.$removeButton = this.container.find( '.remove-button' );
 
-                        this.params.removed = this.params.removed || '';
+                        // Shortcut so that we don't have to use _.bind every time we add a callback.
+                        _.bindAll( this, 'removeFile', 'reRender', 'upload', 'select' );
 
-                        this.success = $.proxy( this.success, this );
+                        // Ensure clicking "remove" removes the file.
+                        this.$removeButton.on( 'click', this.removeFile );
 
-                        this.uploader = $.extend({
-                                container: this.container,
-                                browser:   this.container.find('.upload'),
-                                dropzone:  this.container.find('.upload-dropzone'),
-                                success:   this.success,
-                                plupload:  {},
-                                params:    {}
-                        }, this.uploader || {} );
+                        // Bind upload button, and image (if it exists).
+                        this.$button.on( 'click keydown', this.upload );
+                        this.$img.on( 'click keydown', this.upload );
+                },
 
-                        if ( control.params.extensions ) {
-                                control.uploader.plupload.filters = [{
-                                        title:      api.l10n.allowedFiles,
-                                        extensions: control.params.extensions
-                                }];
+                /**
+                 * Remember that _.bind was used to maintain `this` as the control
+                 * object rather than the usual jQuery way of binding to the DOM element.
+                 */
+                upload: function( event ) {
+                        event.preventDefault();
+
+                        if ( ! this.frame ) {
+                                this.initFrame();
                         }
 
-                        if ( control.params.context )
-                                control.uploader.params['post_data[context]'] = this.params.context;
+                        this.frame.open();
+                },
 
-                        if ( api.settings.theme.stylesheet )
-                                control.uploader.params['post_data[theme]'] = api.settings.theme.stylesheet;
+                /**
+                 * Set the media frame so that it can be reused and accessed when needed.
+                 */
+                initFrame: function() {
+                        this.frame = wp.media({
+                                // The title of the media modal
+                                title: this.params.button_labels.frame_title,
 
-                        this.uploader = new wp.Uploader( this.uploader );
+                                // Restrict to specified mime type.
+                                // @todo try to map $extensions to this in PHP.
+                                library: {
+                                        type: this.params.mime_type
+                                },
+                                button: {
+                                        // Change the submit button label.
+                                        text: this.params.button_labels.frame_button
+                                },
+                                multiple: false
+                        });
 
-                        this.remover = this.container.find('.remove');
-                        this.remover.on( 'click keydown', function( event ) {
-                                if ( event.type === 'keydown' &&  13 !== event.which ) // enter
-                                        return;
+                        // When a file is selected, run a callback.
+                        this.frame.on( 'select', this.select );
+                },
 
-                                control.setting.set( control.params.removed );
-                                event.preventDefault();
-                        });
+                /**
+                 * Fired when an image is selected in the media modal. Gets the selected
+                 * image information, and sets it within the control.
+                 */
+                select: function() {
+                        // Get the attachment from the modal frame.
+                        var attachment = this.frame.state().get( 'selection' ).first().toJSON();
 
-                        this.removerVisibility = $.proxy( this.removerVisibility, this );
-                        this.setting.bind( this.removerVisibility );
-                        this.removerVisibility( this.setting.get() );
+                        this.params.attachment = attachment;
+
+                        // Set the Customizer setting; the callback takes care of rendering.
+                        this.setting( attachment.url );
+                        this.reRender();
                 },
-                success: function( attachment ) {
-                        this.setting.set( attachment.get('url') );
+
+                /**
+                 * Called on whenever a setting is changed.
+                 *
+                 */
+                reRender: function() {
+                        // @todo: something else is needed to preview audio/video files
+                        var self = this;
+                        self.container.html('');
+                        self.renderContent( function() {
+                                // Don't call ready() until the content has rendered.
+                                self.ready();
+                        } );
                 },
-                removerVisibility: function( to ) {
-                        this.remover.toggle( to != this.params.removed );
-                }
+
+
+                /**
+                 * Called when the "Remove" link is clicked. Empties the setting.
+                 * @param {object} event jQuery Event object from click event
+                 */
+                removeFile: function( event ) {
+                        event.preventDefault();
+                        this.setting( '' ); // @todo maybe set to default instead
+                        this.params.attachment = {};
+                        this.reRender();
+                }
         });
 
         /**

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

@@ -580 +580 @@
  * @since 3.4.0
  */
 class WP_Customize_Upload_Control extends WP_Customize_Control {
-        public $type    = 'upload';
-        public $removed = '';
-        public $context;
-        public $extensions = array();
+        public $type     = 'upload';
+        public $mime_type = '';
+        public $button_labels = array(
+                'select' => 'Select File', // @todo PHP doesn't like letting us translate these
+                'change' => 'Change File',
+                'remove' => 'Remove',
+                'frame_title' => 'Select File',
+                'frame_button' => 'Choose File',
+        );
+        public $removed = ''; // unused
+        public $context; // unused
+        public $extensions = array(); // unused
 
         /**
          * Enqueue control related scripts/styles.
@@ -591 +599 @@
          * @since 3.4.0
          */
         public function enqueue() {
-                wp_enqueue_script( 'wp-plupload' );
+                wp_enqueue_media();
         }
 
         /**
@@ -602 +610 @@
          */
         public function to_json() {
                 parent::to_json();
+                $this->json['mime_type'] = $this->mime_type;
+                $this->json['button_labels'] = $this->button_labels;
 
-                $this->json['removed'] = $this->removed;
+                if ( $this->setting ) {
+//                      if ( $this->setting->default ) {
+                        //      $this->json['default_url'] = $this->setting->default; @todo
+//                      }
 
-                if ( $this->context )
-                        $this->json['context'] = $this->context;
-
-                if ( $this->extensions )
-                        $this->json['extensions'] = implode( ',', $this->extensions );
+                        // Get the attachment model for the existing file, or make one.
+                        if ( $this->value() ) {
+                                $attachment_id = attachment_url_to_postid( $this->value() );
+                                if ( $attachment_id ) {
+                                        $this->json['attachment'] = wp_prepare_attachment_for_js( $attachment_id);
+                                }
+                        }
+                }
         }
 
         /**
-         * Render the control's content.
+         * Don't render any content for this control from PHP.
          *
+         * @see WP_Customize_Upload_Control::content_template()
          * @since 3.4.0
          */
-        public function render_content() {
+        public function render_content() {}
+
+        /**
+         * Render a JS template for the content of the upload control.
+         *
+         * @since 4.1.0
+         */
+        public function content_template() {
                 ?>
                 <label>
-                        <?php if ( ! empty( $this->label ) ) : ?>
-                                <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
-                        <?php endif;
-                        if ( ! empty( $this->description ) ) : ?>
-                                <span class="description customize-control-description"><?php echo $this->description; ?></span>
-                        <?php endif; ?>
-                        <div>
-                                <a href="#" class="button-secondary upload"><?php _e( 'Upload' ); ?></a>
-                                <a href="#" class="remove"><?php _e( 'Remove' ); ?></a>
-                        </div>
+                        <# if ( data.label ) { #>
+                                <span class="customize-control-title">{{ data.label }}</span>
+                        <# } #>
+                        <# if ( data.description ) { #>
+                                <span class="description customize-control-description">{{ data.description }}</span>
+                        <# } #>
+
+                        <# if ( data.attachment && data.attachment.id ) { #>
+                                <div class="attachment-media-view {{ data.attachment.orientation }}">
+                                        <div class="thumbnail thumbnail-{{ data.attachment.type }}">
+                                                <# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
+                                                        <img class="attachment-thumb" src="{{ data.attachment.sizes.medium.url }}" draggable="false" />
+                                                <# } else if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.full ) { #>
+                                                        <img class="attachment-thumb" src="{{ data.attachment.sizes.full.url }}" draggable="false" />
+                                                <# } else if ( -1 === jQuery.inArray( data.attachment.type, [ 'audio', 'video' ] ) ) { #>
+                                                        <img class="attachment-thumb type-icon" src="{{ data.attachment.icon }}" class="icon" draggable="false" />
+                                                        <p class="attachment-title">{{ data.attachment.title }}</p>
+                                                <# } #>
+
+                                                <# if ( 'audio' === data.attachment.type ) { #>
+                                                <div class="wp-media-wrapper">
+                                                        <p class="attachment-title">{{ data.attachment.title }}</p>
+                                                        <audio style="visibility: hidden" controls class="wp-audio-shortcode" width="100%" preload="none">
+                                                                <source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
+                                                        </audio>
+                                                </div>
+                                                <# } else if ( 'video' === data.attachment.type ) {
+                                                        var w_rule = h_rule = '';
+                                                        if ( data.attachment.width ) {
+                                                                w_rule = 'width: ' + data.attachment.width + 'px;';
+                                                        } else if ( wp.media.view.settings.contentWidth ) {
+                                                                w_rule = 'width: ' + wp.media.view.settings.contentWidth + 'px;';
+                                                        }
+                                                        if ( data.attachment.height ) {
+                                                                h_rule = 'height: ' + data.attachment.height + 'px;';
+                                                        }
+                                                        #>
+                                                        <div style="{{ w_rule }}{{ h_rule }}" class="wp-media-wrapper wp-video">
+                                                                <video controls="controls" class="wp-video-shortcode" preload="metadata"
+                                                                        <# if ( data.attachment.width ) { #>width="{{ data.attachment.width }}"<# } #>
+                                                                        <# if ( data.attachment.height ) { #>height="{{ data.attachment.height }}"<# } #>
+                                                                        <# if ( data.attachment.image && data.attachment.image.src !== data.attachment.icon ) { #>poster="{{ data.attachment.image.src }}"<# } #>>
+                                                                        <source type="{{ data.attachment.mime }}" src="{{ data.attachment.url }}"/>
+                                                                </video>
+                                                        </div>
+                                                <# } #>
+                                        </div>
+                                </div>
+                                <a class="button upload-button" href="#"><?php echo $this->button_labels['change']; ?></a>
+                                <a class="remove-button" href="#"><?php echo $this->button_labels['remove']; ?></a>
+                        <# } else { #>
+                                <a class="button upload-button" href="#"><?php echo $this->button_labels['select']; ?></a>
+                        <# } #>
                 </label>
                 <?php
         }
@@ -644 +711 @@
  */
 class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
         public $type = 'image';
-        public $get_url;
-        public $statuses;
-        public $extensions = array( 'jpg', 'jpeg', 'gif', 'png' );
+        public $mime_type = 'image';
+        public $button_labels = array(
+                'select' => 'Select Image', // @todo PHP doesn't like letting us translate these
+                'change' => 'Change Image',
+                'remove' => 'Remove',
+                'frame_title' => 'Select Image',
+                'frame_button' => 'Choose Image',
+        );
 
-        protected $tabs = array();
-
         /**
-         * Constructor.
-         *
-         * @since 3.4.0
-         * @uses WP_Customize_Upload_Control::__construct()
-         *
-         * @param WP_Customize_Manager $manager
-         * @param string $id
-         * @param array $args
-         */
-        public function __construct( $manager, $id, $args ) {
-                $this->statuses = array( '' => __('No Image') );
-
-                parent::__construct( $manager, $id, $args );
-
-                $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 );
-        }
-
-        /**
-         * Refresh the parameters passed to the JavaScript via JSON.
-         *
-         * @since 3.4.0
-         * @uses WP_Customize_Upload_Control::to_json()
-         */
-        public function to_json() {
-                parent::to_json();
-                $this->json['statuses'] = $this->statuses;
-        }
-
-        /**
-         * Render the control's content.
-         *
-         * @since 3.4.0
-         */
-        public function render_content() {
-                $src = $this->value();
-                if ( isset( $this->get_url ) )
-                        $src = call_user_func( $this->get_url, $src );
-
-                ?>
-                <div class="customize-image-picker">
-                        <?php if ( ! empty( $this->label ) ) : ?>
-                                <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
-                        <?php endif;
-                        if ( ! empty( $this->description ) ) : ?>
-                                <span class="description customize-control-description"><?php echo $this->description; ?></span>
-                        <?php endif; ?>
-
-                        <div class="customize-control-content">
-                                <div class="dropdown preview-thumbnail" tabindex="0">
-                                        <div class="dropdown-content">
-                                                <?php if ( empty( $src ) ): ?>
-                                                        <img style="display:none;" />
-                                                <?php else: ?>
-                                                        <img src="<?php echo esc_url( set_url_scheme( $src ) ); ?>" />
-                                                <?php endif; ?>
-                                                <div class="dropdown-status"></div>
-                                        </div>
-                                        <div class="dropdown-arrow"></div>
-                                </div>
-                        </div>
-
-                        <div class="library">
-                                <ul>
-                                        <?php foreach ( $this->tabs as $id => $tab ): ?>
-                                                <li data-customize-tab='<?php echo esc_attr( $id ); ?>' tabindex='0'>
-                                                        <?php echo esc_html( $tab['label'] ); ?>
-                                                </li>
-                                        <?php endforeach; ?>
-                                </ul>
-                                <?php foreach ( $this->tabs as $id => $tab ): ?>
-                                        <div class="library-content" data-customize-tab='<?php echo esc_attr( $id ); ?>'>
-                                                <?php call_user_func( $tab['callback'] ); ?>
-                                        </div>
-                                <?php endforeach; ?>
-                        </div>
-
-                        <div class="actions">
-                                <a href="#" class="remove"><?php _e( 'Remove Image' ); ?></a>
-                        </div>
-                </div>
-                <?php
-        }
-
-        /**
          * Add a tab to the control.
          *
          * @since 3.4.0
+         * @deprecated 4.1.0
          *
          * @param string $id
          * @param string $label
          * @param mixed $callback
          */
-        public function add_tab( $id, $label, $callback ) {
-                $this->tabs[ $id ] = array(
-                        'label'    => $label,
-                        'callback' => $callback,
-                );
-        }
+        public function add_tab( $id, $label, $callback ) {}
 
         /**
          * Remove a tab from the control.
          *
          * @since 3.4.0
+         * @deprecated 4.1.0
          *
          * @param string $id
          */
-        public function remove_tab( $id ) {
-                unset( $this->tabs[ $id ] );
-        }
-
-        /**
-         * @since 3.4.0
-         */
-        public function tab_upload_new() {
-                if ( ! _device_can_upload() ) {
-                        echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ) . '</p>';
-                } else {
-                        ?>
-                        <div class="upload-dropzone">
-                                <?php _e('Drop a file here or <a href="#" class="upload">select a file</a>.'); ?>
-                        </div>
-                        <div class="upload-fallback">
-                                <span class="button-secondary"><?php _e('Select File'); ?></span>
-                        </div>
-                        <?php
-                }
-        }
-
-        /**
-         * @since 3.4.0
-         */
-        public function tab_uploaded() {
-                ?>
-                <div class="uploaded-target"></div>
-                <?php
-        }
-
-        /**
-         * @since 3.4.0
-         *
-         * @param string $url
-         * @param string $thumbnail_url
-         */
-        public function print_tab_image( $url, $thumbnail_url = null ) {
-                $url = set_url_scheme( $url );
-                $thumbnail_url = ( $thumbnail_url ) ? set_url_scheme( $thumbnail_url ) : $url;
-                ?>
-                <a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $url ); ?>">
-                        <img src="<?php echo esc_url( $thumbnail_url ); ?>" />
-                </a>
-                <?php
-        }
+        public function remove_tab( $id ) {}
 }
 
 /**

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

@@ -962 +962 @@
 
                 /* Control Types (custom control classes) */
                 $this->register_control_type( 'WP_Customize_Color_Control' );
+                $this->register_control_type( 'WP_Customize_Upload_Control' );
+                $this->register_control_type( 'WP_Customize_Image_Control' );
 
                 /* Site Title & Tagline */