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

Timestamp:

10/02/2017 03:36:18 AM (6 years ago)

Author:

westonruter

Message:

Customize: Add infrastructure for trashing/reverting of unpublished changes; introduce full-screen OverlayNotification for trashing and theme install/preview.

• Introduce a new wp.customize.previewer.trash() JS API to trash the current changeset, along with logic to WP_Customize_Manager to handle deleting changeset drafts.
• Add trashing to wp.customize.state which is then used to update the UI.
• UI for trashing is pending design feedback. One possibility is to add a new trash button to Publish Settings section that invokes wp.customize.previewer.trash().
• Improve logic for managing the visibility and disabled states for publish buttons.
• Prevent attempting requestChangesetUpdate while processing and bump processing while doing save.
• Update changeset_date state only if sent in save response.
• Merge ThemesSection#loadThemePreview() into ThemesPanel#loadThemePreview().
• Remove unused autosaved state.
• Start autosaving and prompting at beforeunload after a change first happens. This is key for theme previews since even if a user did not make any changes, there were still dirty settings which would get stored in an auto-draft unexpectedly.
• Allow Notification to accept additional classes to be added to container.
• Introduce OverlayNotification and use for theme installing, previewing, and trashing. Such overlay notifications take over the entire window.

Props westonruter, celloexpressions.
See #37661, #39896, #21666, #35210.

File:

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

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

@@ -375 +375 @@
         remove_action( 'admin_init', '_maybe_update_themes' );
 
-        add_action( 'wp_ajax_customize_save',           array( $this, 'save' ) );
-        add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
-        add_action( 'wp_ajax_customize-load-themes',    array( $this, 'load_themes_ajax' ) );
-        add_action( 'wp_ajax_dismiss_customize_changeset_autosave', array( $this, 'handle_dismiss_changeset_autosave_request' ) );
+        add_action( 'wp_ajax_customize_save',             array( $this, 'save' ) );
+        add_action( 'wp_ajax_customize_trash',            array( $this, 'handle_changeset_trash_request' ) );
+        add_action( 'wp_ajax_customize_refresh_nonces',   array( $this, 'refresh_nonces' ) );
+        add_action( 'wp_ajax_customize_load_themes',      array( $this, 'handle_load_themes_request' ) );
+        add_action( 'wp_ajax_customize_dismiss_autosave', array( $this, 'handle_dismiss_autosave_request' ) );
 
         add_action( 'customize_register',                 array( $this, 'register_controls' ) );
@@ -2831 +2832 @@
 
     /**
+     * Handle request to trash a changeset.
+     *
+     * @since 4.9.0
+     */
+    public function handle_changeset_trash_request() {
+        if ( ! is_user_logged_in() ) {
+            wp_send_json_error( 'unauthenticated' );
+        }
+
+        if ( ! $this->is_preview() ) {
+            wp_send_json_error( 'not_preview' );
+        }
+
+        if ( ! check_ajax_referer( 'trash_customize_changeset', 'nonce', false ) ) {
+            wp_send_json_error( array(
+                'code' => 'invalid_nonce',
+                'message' => __( 'There was an authentication problem. Please reload and try again.' ),
+            ) );
+        }
+
+        $changeset_post_id = $this->changeset_post_id();
+
+        if ( ! $changeset_post_id ) {
+            wp_send_json_error( array(
+                'message' => __( 'No changes saved yet, so there is nothing to trash.' ),
+                'code' => 'non_existent_changeset',
+            ) );
+            return;
+        }
+
+        if ( $changeset_post_id && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
+            wp_send_json_error( array(
+                'code' => 'changeset_trash_unauthorized',
+                'message' => __( 'Unable to trash changes.' ),
+            ) );
+        }
+
+        if ( 'trash' === get_post_status( $changeset_post_id ) ) {
+            wp_send_json_error( array(
+                'message' => __( 'Changes have already been trashed.' ),
+                'code' => 'changeset_already_trashed',
+            ) );
+            return;
+        }
+
+        $r = wp_trash_post( $changeset_post_id );
+        if ( ! ( $r instanceof WP_Post ) ) {
+            wp_send_json_error( array(
+                'code' => 'changeset_trash_failure',
+                'message' => __( 'Unable to trash changes.' ),
+            ) );
+        }
+
+        wp_send_json_success( array(
+            'message' => __( 'Changes trashed successfully.' ),
+        ) );
+    }
+
+    /**
      * Re-map 'edit_post' meta cap for a customize_changeset post to be the same as 'customize' maps.
      *
@@ -3103 +3163 @@
      * @since 4.9.0
      */
-    public function handle_dismiss_changeset_autosave_request() {
+    public function handle_dismiss_autosave_request() {
         if ( ! $this->is_preview() ) {
             wp_send_json_error( 'not_preview', 400 );
         }
 
-        if ( ! check_ajax_referer( 'dismiss_customize_changeset_autosave', 'nonce', false ) ) {
+        if ( ! check_ajax_referer( 'customize_dismiss_autosave', 'nonce', false ) ) {
             wp_send_json_error( 'invalid_nonce', 403 );
         }
@@ -3544 +3604 @@
         ?>
         <script type="text/html" id="tmpl-customize-notification">
-            <li class="notice notice-{{ data.type || 'info' }} {{ data.alt ? 'notice-alt' : '' }} {{ data.dismissible ? 'is-dismissible' : '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
-                {{{ data.message || data.code }}}
+            <li class="notice notice-{{ data.type || 'info' }} {{ data.alt ? 'notice-alt' : '' }} {{ data.dismissible ? 'is-dismissible' : '' }} {{ data.classes || '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
+                <div class="notification-message">{{{ data.message || data.code }}}</div>
                 <# if ( data.dismissible ) { #>
                     <button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php _e( 'Dismiss' ); ?></span></button>
@@ -3577 +3637 @@
             </div>
         </script>
+        <script type="text/html" id="tmpl-customize-trash-changeset-control">
+            <button type="button" class="button-link button-link-delete"><?php _e( 'Trash unpublished changes' ); ?></button>
+        </script>
         <?php
     }
@@ -3902 +3965 @@
             'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
             'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
-            'switch-themes' => wp_create_nonce( 'switch-themes' ),
-            'dismiss_autosave' => wp_create_nonce( 'dismiss_customize_changeset_autosave' ),
+            'switch_themes' => wp_create_nonce( 'switch_themes' ),
+            'dismiss_autosave' => wp_create_nonce( 'customize_dismiss_autosave' ),
+            'trash' => wp_create_nonce( 'trash_customize_changeset' ),
         );
 
@@ -4160 +4224 @@
         $this->add_control( 'changeset_status', array(
             'section' => 'publish_settings',
+            'priority' => 10,
             'settings' => array(),
             'type' => 'radio',
@@ -4174 +4239 @@
         $this->add_control( new WP_Customize_Date_Time_Control( $this, 'changeset_scheduled_date', array(
             'section' => 'publish_settings',
+            'priority' => 20,
             'settings' => array(),
             'type' => 'date_time',
@@ -4724 +4790 @@
      * @since 4.9.0
      */
-    public function load_themes_ajax() {
-        check_ajax_referer( 'switch-themes', 'switch-themes-nonce' );
+    public function handle_load_themes_request() {
+        check_ajax_referer( 'switch_themes', 'nonce' );
 
         if ( ! current_user_can( 'switch_themes' ) ) {