Changeset 24042

Timestamp:

04/22/2013 03:08:51 AM (11 years ago)

Author:

azaozz

Message:

Post locks:

• Show 'Saving revision...' while autosaving after a post has been taken over. Change to 'Your latest changes were saved as a revision.' when autosave completes.
• Make sure a user exists before using $user->display_name.
• Add 'post_lock_text' action for extending the message text.

Location:

trunk

Files:

• wp-admin/css/wp-admin.css (modified) (2 diffs)
• wp-admin/includes/misc.php (modified) (2 diffs)
• wp-admin/includes/post.php (modified) (3 diffs)
• wp-admin/js/post.js (modified) (2 diffs)
• wp-includes/js/autosave.js (modified) (2 diffs)

trunk/wp-admin/css/wp-admin.css

@@ -3400 +3400 @@
     margin-left: -225px;
     background: #fff;
+    line-height: 1.5;
     z-index: 1000005;
 }
@@ -3426 +3427 @@
 #notification-dialog .post-locked-avatar {
     float: left;
-    margin-right: 20px;
-}
-
-#notification-dialog .currently-editing {
-    margin-bottom: 20px;
+    margin: 0 20px 20px 0;
+}
+
+#notification-dialog .wp-tab-first {
     outline: 0;
 }
 
+#notification-dialog .locked-saving img {
+    float: left;
+    margin-right: 3px;
+}
+
+#notification-dialog-wrap.saving .locked-saving,
+#notification-dialog-wrap.saved .locked-saved {
+    display: inline;
+}
 
 /*------------------------------------------------------------------------------

trunk/wp-admin/includes/misc.php

@@ -575 +575 @@
 
             if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
-                $send = array();
+                $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
 
                 if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
                     $send['avatar_src'] = $matches[1];
 
-                $send['text'] = sprintf( __( '%s is currently editing' ), $user->display_name );
                 $checked[$key] = $send;
             }
@@ -609 +608 @@
             return $response;
 
-        if ( $user_id = wp_check_post_lock( $post_id ) ) {
-            $user = get_userdata( $user_id );
-
+        if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
             $error = array(
                 'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )

trunk/wp-admin/includes/post.php

@@ -1198 +1198 @@
         return;
 
-    if ( $user = wp_check_post_lock( $post->ID ) ) {
-        $user = get_userdata( $user );
+    if ( ( $user_id = wp_check_post_lock( $post->ID ) ) && ( $user = get_userdata( $user_id ) ) ) {
         $locked = apply_filters( 'show_post_locked_dialog', true, $post, $user );
     } else {
@@ -1230 +1229 @@
         <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
         <p class="currently-editing wp-tab-first" tabindex="0"><?php esc_html_e( sprintf( __( 'This content is currently locked. If you take over, %s will be blocked from continuing to edit.' ), $user->display_name ) ); ?></p>
+        <?php do_action( 'post_lock_text', $post ); ?>
         <p>
         <a class="button" href="<?php echo esc_url( wp_get_referer() ); ?>"><?php _e('Go back'); ?></a>
@@ -1250 +1250 @@
         <div class="post-taken-over">
             <div class="post-locked-avatar"></div>
-            <p class="currently-editing wp-tab-first" tabindex="0"></p>
+            <p class="wp-tab-first" tabindex="0">
+            <span class="currently-editing"></span><br>
+            <span class="locked-saving hidden"><img src="images/wpspin_light-2x.gif" width="16" height="16" /> <?php _e('Saving revision...'); ?></span>
+            <span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
+            </p>
+            <?php do_action( 'post_lock_text', $post ); ?>
             <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( admin_url('edit.php') ); ?>"><?php _e('Go to All Posts'); ?></a></p>
         </div>

trunk/wp-admin/js/post.js

@@ -278 +278 @@
 
             if ( wrap.length && ! wrap.is(':visible') ) {
-                if ( typeof autosave == 'function' )
+                if ( typeof autosave == 'function' ) {
+                    $(document).on('autosave-disable-buttons.post-lock', function() {
+                        wrap.addClass('saving');
+                    }).on('autosave-enable-buttons.post-lock', function() {
+                        wrap.removeClass('saving').addClass('saved');
+                        window.onbeforeunload = null;
+                    });
+
+                    // Save the latest changes and disable
                     autosave();
+                    autosave = function(){};
+                }
 
                 if ( received.lock_error.avatar_src ) {
@@ -286 +296 @@
                 }
 
-                wrap.show().find('p.currently-editing').text( received.lock_error.text ).focus();
+                wrap.show().find('.currently-editing').text( received.lock_error.text );
+                wrap.find('.wp-tab-first').focus();
             }
         } else if ( received.new_lock ) {

trunk/wp-includes/js/autosave.js

@@ -228 +228 @@
 
 function autosave_enable_buttons() {
+    jQuery(document).trigger('autosave-enable-buttons');
     if ( ! wp.heartbeat.connectionLost ) {
         // delay that a bit to avoid some rare collisions while the DOM is being updated.
@@ -239 +240 @@
 
 function autosave_disable_buttons() {
+    jQuery(document).trigger('autosave-disable-buttons');
     jQuery('#submitpost').find(':button, :submit').prop('disabled', true);
     // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.