Changeset 41750 for trunk/src/wp-includes/class-wp-customize-manager.php

Timestamp:

10/04/2017 08:01:12 PM (9 years ago)

Author:

westonruter

Message:

Customize: Allow controls to be created with pre-instantiated Setting object(s), or even with plain Value object(s).

• Allow passing settings in keyed object (e.g. settings: { default: 'id' } ), or as an array (e.g. settings: [ 'id' ]) with first being default; again, Setting/Value` objects may be supplied instead of IDs.
• Allow a single setting to be supplied with just a single setting param, either a string or a Setting/Value object.
• Update changeset_status and scheduled_changeset_date to be added dynamically with JS and simply passing of api.state() instances as setting.
• Introduce a data-customize-setting-key-link attribute which, unlike data-customize-setting-link, allows passing the setting key (e.g. default) as opposed to the setting ID.
• Allow WP_Customize_Control::get_link() to return data-customize-setting-key-link when setting is not registered.
• Eliminate default_value from WP_Customize_Date_Time_Control since now comes from supplied Value.
• Export status choices as wp.customize.settings.changeset.statusChoices.
• Export date and time formats as wp.customize.settings.dateFormat and wp.customize.settings.timeFormat respectively.

Props westonruter, sayedwp.
See #39896, #30738, #30741, #42083.
Fixes #37964, #36167.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (5 diffs)

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

@@ -3643 +3643 @@
                         <button type="button" class="button-link button-link-delete"><?php _e( 'Discard changes' ); ?></button>
                 </script>
+                <script type="text/html" id="tmpl-customize-selected-changeset-status-control">
+                        <# var inputId = _.uniqueId( 'customize-selected-changeset-status-control-input-' ); #>
+                        <# var descriptionId = _.uniqueId( 'customize-selected-changeset-status-control-description-' ); #>
+                        <# if ( data.label ) { #>
+                                <label for="{{ inputId }}" class="customize-control-title">{{ data.label }}</label>
+                        <# } #>
+                        <# if ( data.description ) { #>
+                                <span id="{{ descriptionId }}" class="description customize-control-description">{{{ data.description }}}</span>
+                        <# } #>
+                        <# _.each( data.choices, function( choice ) { #>
+                                <# var choiceId = inputId + '-' + choice.status; #>
+                                <span class="customize-inside-control-row">
+                                        <input id="{{ choiceId }}" type="radio" value="{{ choice.status }}" name="{{ inputId }}" data-customize-setting-key-link="default">
+                                        <label for="{{ choiceId }}">{{ choice.label }}</label>
+                                </span>
+                        <# } ); #>
+                </script>
                 <?php
         }
@@ -4025 +4042 @@
                 }
 
+                $current_user_can_publish = current_user_can( get_post_type_object( 'customize_changeset' )->cap->publish_posts );
+
+                // @todo Include all of the status labels here from script-loader.php, and then allow it to be filtered.
+                $status_choices = array();
+                if ( $current_user_can_publish ) {
+                        $status_choices[] = array(
+                                'status' => 'publish',
+                                'label' => __( 'Publish' ),
+                        );
+                }
+                $status_choices[] = array(
+                        'status' => 'draft',
+                        'label' => __( 'Save Draft' ),
+                );
+                if ( $current_user_can_publish ) {
+                        $status_choices[] = array(
+                                'status' => 'future',
+                                'label' => __( 'Schedule' ),
+                        );
+                }
+
                 // Prepare Customizer settings to pass to JavaScript.
                 $changeset_post = null;
                 if ( $changeset_post_id ) {
                         $changeset_post = get_post( $changeset_post_id );
+                }
+
+                if ( $this->changeset_post_id() && 'future' === get_post_status( $this->changeset_post_id() ) ) {
+                        $initial_date = get_the_time( 'Y-m-d H:i:s', $this->changeset_post_id() );
+                } else {
+                        $initial_date = current_time( 'mysql', false );
                 }
 
@@ -4039 +4083 @@
                                 'latestAutoDraftUuid' => $autosave_autodraft_post ? $autosave_autodraft_post->post_name : null,
                                 'status' => $changeset_post ? $changeset_post->post_status : '',
-                                'currentUserCanPublish' => current_user_can( get_post_type_object( 'customize_changeset' )->cap->publish_posts ),
-                                'publishDate' => $changeset_post ? $changeset_post->post_date : '', // @todo Only if future status? Rename to just date?
+                                'currentUserCanPublish' => $current_user_can_publish,
+                                'publishDate' => $initial_date,
+                                'statusChoices' => $status_choices,
                         ),
                         'initialServerDate' => current_time( 'mysql', false ),
+                        'dateFormat' => get_option( 'date_format' ),
+                        'timeFormat' => get_option( 'time_format' ),
                         'initialServerTimestamp' => floor( microtime( true ) * 1000 ),
                         'initialClientTimestamp' => -1, // To be set with JS below.
@@ -4206 +4253 @@
                 /* Publish Settings */
 
+                // Note the controls for this section are added via JS.
                 $this->add_section( 'publish_settings', array(
                         'title' => __( 'Publish Settings' ),
@@ -4213 +4261 @@
                         'active_callback' => array( $this, 'is_theme_active' ),
                 ) );
-
-                /* Publish Settings Controls */
-                $status_choices = array(
-                        'publish' => __( 'Publish' ),
-                        'draft' => __( 'Save Draft' ),
-                        'future' => __( 'Schedule' ),
-                );
-
-                if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->publish_posts ) ) {
-                        unset( $status_choices['publish'] );
-                }
-
-                $this->add_control( 'changeset_status', array(
-                        'section' => 'publish_settings',
-                        'priority' => 10,
-                        'settings' => array(),
-                        'type' => 'radio',
-                        'label' => __( 'Action' ),
-                        'choices' => $status_choices,
-                        'capability' => 'customize',
-                ) );
-
-                if ( $this->changeset_post_id() && 'future' === get_post_status( $this->changeset_post_id() ) ) {
-                        $initial_date = get_the_time( 'Y-m-d H:i:s', $this->changeset_post_id() );
-                } else {
-                        $initial_date = current_time( 'mysql', false );
-                }
-
-                $this->add_control( new WP_Customize_Date_Time_Control( $this, 'changeset_scheduled_date', array(
-                        'section' => 'publish_settings',
-                        'priority' => 20,
-                        'settings' => array(),
-                        'type' => 'date_time',
-                        'min_year' => date( 'Y' ),
-                        'allow_past_date' => false,
-                        'include_time' => true,
-                        'twelve_hour_format' => false !== stripos( get_option( 'time_format' ), 'a' ),
-                        'description' => __( 'Schedule your customization changes to publish ("go live") at a future date.' ),
-                        'capability' => 'customize',
-                        'default_value' => $initial_date,
-                ) ) );
 
                 /* Themes (controls are loaded via ajax) */