Changeset 31992

Timestamp:

04/03/2015 01:33:30 AM (10 years ago)

Author:

azaozz

Message:

Press This:

• Show a spinner while saving a post.
• Do not redirect after saving a draft.
• Make the unidentified error message clearer.

Fixes #31875.

Location:

trunk/src

Files:

• wp-admin/css/press-this.css (modified) (1 diff)
• wp-admin/includes/class-wp-press-this.php (modified) (2 diffs)
• wp-admin/js/press-this.js (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -1364 +1364 @@
 }
 
+.spinner {
+    height: 20px;
+    width: 20px;
+    display: inline-block;
+    visibility: hidden;
+    background: url(../images/spinner.gif) no-repeat center;
+    -webkit-background-size: 20px 20px;
+    background-size: 20px 20px;
+    opacity: 0.7;
+    filter: alpha(opacity=70);
+    line-height: 30px;
+    vertical-align: baseline;
+}
+
+@media print,
+    (-webkit-min-device-pixel-ratio: 1.25),
+    (min-resolution: 120dpi) {
+
+    .spinner {
+        background-image: url(../images/spinner-2x.gif);
+    }
+}
+
+.spinner.is-visible {
+    visibility: visible;
+}
+
 /* Make the text inside the editor textarea white. Prevents a "flash" on loading the page */
 #pressthis {

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

@@ -149 +149 @@
 
             if ( 'publish' === get_post_status( $post_id ) ) {
-                /**
-                 * Filter the URL to redirect to when Press This saves.
-                 *
-                 * @since 4.2.0
-                 *
-                 * @param string $url     Redirect URL. If `$status` is 'publish', this will be the post permalink.
-                 *                        Otherwise, the post edit URL will be used.
-                 * @param int    $post_id Post ID.
-                 * @param string $status  Post status.
-                 */
-                $redirect = apply_filters( 'press_this_save_redirect', get_post_permalink( $post_id ), $post_id, $post['post_status'] );
+                $redirect = get_post_permalink( $post_id );
             } else {
-                /** This filter is documented in wp-admin/includes/class-wp-press-this.php */
-                $redirect = apply_filters( 'press_this_save_redirect', get_edit_post_link( $post_id, 'raw' ), $post_id, $post['post_status'] );
-            }
-
-            wp_send_json_success( array( 'redirect' => $redirect ) );
+                $redirect = false;
+            }
+
+            /**
+             * Filter the URL to redirect to when Press This saves.
+             *
+             * @since 4.2.0
+             *
+             * @param string $url     Redirect URL. If `$status` is 'publish', this will be the post permalink.
+             *                        Otherwise, the post edit URL will be used.
+             * @param int    $post_id Post ID.
+             * @param string $status  Post status.
+             */
+            $redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post['post_status'] );
+
+            if ( $redirect ) {
+                wp_send_json_success( array( 'redirect' => $redirect ) );
+            } else {
+                wp_send_json_success( array( 'postSaved' => true ) );
+            }
         }
     }
@@ -1340 +1345 @@
         </div>
         <div class="post-actions">
+            <span class="spinner">&nbsp;</span>
             <button type="button" class="button-subtle draft-button"><?php _e( 'Save Draft' ); ?></button>
             <button type="button" class="button-subtle preview-button"><?php _e( 'Preview' ); ?></button>

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

@@ -102 +102 @@
          */
         function showSpinner() {
-            $( '#spinner' ).addClass( 'show' );
+            $( '.spinner' ).addClass( 'is-visible' );
             $( '.post-actions button' ).each( function() {
                 $( this ).attr( 'disabled', 'disabled' );
@@ -112 +112 @@
          */
         function hideSpinner() {
-            $( '#spinner' ).removeClass( 'show' );
+            $( '.spinner' ).removeClass( 'is-visible' );
             $( '.post-actions button' ).each( function() {
                 $( this ).removeAttr( 'disabled' );
@@ -182 +182 @@
                 type: 'post',
                 url: window.ajaxurl,
-                data: data,
-                success: function( response ) {
-                    if ( ! response.success ) {
-                        renderError( response.data.errorMessage );
-                        hideSpinner();
-                    } else if ( response.data.redirect ) {
-                        if ( window.opener && settings.redirInParent ) {
-                            try {
-                                window.opener.location.href = response.data.redirect;
-                            } catch( er ) {}
-
-                            window.self.close();
-                        } else {
-                            window.location.href = response.data.redirect;
-                        }
+                data: data
+            }).always( function() {
+                hideSpinner();
+            }).done( function( response ) {
+                if ( ! response.success ) {
+                    renderError( response.data.errorMessage );
+                } else if ( response.data.redirect ) {
+                    if ( window.opener && settings.redirInParent ) {
+                        try {
+                            window.opener.location.href = response.data.redirect;
+                        } catch( er ) {}
+
+                        window.self.close();
+                    } else {
+                        window.location.href = response.data.redirect;
                     }
-                }
-            } );
+                } else if ( response.data.postSaved ) {
+                    // show "success" message?
+                }
+            }).fail( function() {
+                renderError( __( 'serverError' ) );
+            });
         }
 

trunk/src/wp-includes/script-loader.php

@@ -479 +479 @@
         did_action( 'init' ) && $scripts->localize( 'press-this', 'pressThisL10n', array(
             'newPost' => __( 'Title' ),
-            'unexpectedError' => __( 'Sorry, but an unexpected error occurred.' ),
+            'serverError' => __( 'Connection lost or the server is busy. Please try again later.' ),
             'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
             /* translators: %d: nth embed found in a post */