Changeset 32983

Timestamp:

06/28/2015 04:58:56 AM (10 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.

Location:

trunk/src/wp-admin

Files:

• css/press-this.css (modified) (1 diff)
• includes/class-wp-press-this.php (modified) (5 diffs)
• js/press-this.js (modified) (4 diffs)

trunk/src/wp-admin/css/press-this.css

@@ -1889 +1889 @@
 }
 
+.publish-button .saving-draft,
+.publish-button.is-saving .publish {
+    display: none;
+}
+
+.publish-button.is-saving .saving-draft {
+    display: inline;
+}
+
 /* TinyMCE styles */
 .editor .wp-media-buttons {

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>

trunk/src/wp-admin/js/press-this.js

@@ -183 +183 @@
                 hideSpinner();
                 clearNotices();
+                $( '.publish-button' ).removeClass( 'is-saving' );
             }).done( function( response ) {
                 if ( ! response.success ) {
                     renderError( response.data.errorMessage );
                 } else if ( response.data.redirect ) {
-                    if ( window.opener && settings.redirInParent ) {
+                    if ( window.opener && ( settings.redirInParent || response.data.force ) ) {
                         try {
                             window.opener.location.href = response.data.redirect;
-                        } catch( er ) {}
-
-                        window.self.close();
+
+                            window.setTimeout( function() {
+                                window.self.close();
+                            }, 200 )
+                        } catch( er ) {
+                            window.location.href = response.data.redirect;
+                        }
                     } else {
                         window.location.href = response.data.redirect;
                     }
-                } else if ( response.data.postSaved ) {
-                    // consider showing "Saved" message
                 }
             }).fail( function() {
@@ -661 +664 @@
                 if ( $button.length ) {
                     if ( $button.hasClass( 'draft-button' ) ) {
+                        $( '.publish-button' ).addClass( 'is-saving' );
                         submitPost( 'draft' );
                     } else if ( $button.hasClass( 'publish-button' ) ) {
+                        $button.addClass( 'is-saving' );
                         submitPost( 'publish' );
                     } else if ( $button.hasClass( 'preview-button' ) ) {
@@ -671 +676 @@
                         $( '#pressthis-form' ).attr( 'target', '_blank' ).submit().attr( 'target', '' );
                         $( '#wp-preview' ).val( '' );
+                    } else if ( $button.hasClass( 'standard-editor-button' ) ) {
+                        $( '.publish-button' ).addClass( 'is-saving' );
+                        $( '#pt-force-redirect' ).val( 'true' );
+                        submitPost( 'draft' );
                     } else if ( $button.hasClass( 'split-button-toggle' ) ) {
                         if ( $splitButton.hasClass( 'is-open' ) ) {
@@ -680 +689 @@
                         }
                     }
-                } else if ( $target.hasClass( 'edit-post-link' ) && window.opener ) {
-                    window.opener.focus();
-                    window.self.close();
                 }
             });