Changeset 32983 for trunk/src/wp-admin/includes/class-wp-press-this.php

Timestamp:

06/28/2015 04:58:56 AM (11 years ago)

Author:

azaozz

Message:

Press This:

• Save a draft before opening the standard editor window.
• While saving a post show Saving... instead of Publish for the main visible part of the split button (same as the Save Draft button before).

See #32757.

File:

• trunk/src/wp-admin/includes/class-wp-press-this.php (modified) (5 diffs)

trunk/src/wp-admin/includes/class-wp-press-this.php

@@ -147 +147 @@
                         }
 
+                        $forceRedirect = false;
+
                         if ( 'publish' === get_post_status( $post_id ) ) {
                                 $redirect = get_post_permalink( $post_id );
+                        } elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+                                $forceRedirect = true;
+                                $redirect = get_edit_post_link( $post_id, 'js' );
                         } else {
                                 $redirect = false;
@@ -166 +171 @@
 
                         if ( $redirect ) {
-                                wp_send_json_success( array( 'redirect' => $redirect ) );
+                                wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
                         } else {
                                 wp_send_json_success( array( 'postSaved' => true ) );
@@ -1330 +1335 @@
                 <input type="hidden" name="wp-preview" id="wp-preview" value="" />
                 <input type="hidden" name="post_title" id="post_title" value="" />
+                <input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
                 <?php
 
@@ -1457 +1463 @@
                         <div class="split-button">
                                 <div class="split-button-head">
-                                        <button type="button" class="publish-button split-button-primary"><?php
-                                                echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' );
-                                        ?></button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
+                                        <button type="button" class="publish-button split-button-primary" aria-live="polite">
+                                                <span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
+                                                <span class="saving-draft"><?php _e( 'Saving...' ); ?></span>
+                                        </button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
                                                 <i class="dashicons dashicons-arrow-down-alt2"></i>
                                                 <span class="screen-reader-text"><?php _e('More actions'); ?></span>
@@ -1465 +1472 @@
                                 </div>
                                 <ul class="split-button-body">
-                                        <li><button type="button" class="button-subtle draft-button split-button-option" aria-live="polite"><?php _e( 'Save Draft' ); ?></button></li>
-                                        <li><a href="<?php echo esc_url( get_edit_post_link( $post_ID ) ); ?>" class="edit-post-link split-button-option" target="_blank"><?php _e( 'Standard Editor' ); ?></a></li>
+                                        <li><button type="button" class="button-subtle draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
+                                        <li><button type="button" class="button-subtle standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
                                         <li><button type="button" class="button-subtle preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
                                 </ul>