Changeset 23733

Timestamp:

03/16/2013 08:46:37 PM (12 years ago)

Author:

azaozz

Message:

Post locks: when a dialog is shown move focus to the text, see #23697

Location:

trunk/wp-admin

Files:

• includes/post.php (modified) (2 diffs)
• js/post.js (modified) (4 diffs)

trunk/wp-admin/includes/post.php

@@ -1231 +1231 @@
         <div class="post-locked-message">
         <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
-        <p><?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>
+        <p class="currently-editing" 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>
         <p>
         <a class="button" href="<?php echo esc_url( wp_get_referer() ); ?>"><?php _e('Go back'); ?></a>
@@ -1252 +1252 @@
         <div class="post-taken-over">
             <div class="post-locked-avatar"></div>
-            <p class="currently-editing"></p>
+            <p class="currently-editing" tabindex="0"></p>
             <p><a class="button button-primary" href="<?php echo esc_url( admin_url('edit.php') ); ?>"><?php _e('Go to All Posts'); ?></a></p>
         </div>

trunk/wp-admin/js/post.js

@@ -266 +266 @@
 });
 
+// Post locks: update the lock string or show the dialog if somebody has taken over editing
 $(document).on( 'heartbeat-tick.refresh-lock', function( e, data ) {
     var received, wrap, avatar;
@@ -278 +279 @@
             if ( ! wrap.is(':visible') ) {
                 autosave();
-                wrap.find('p.currently-editing').text( received.lock_error.text );
-                
+
                 if ( received.lock_error.avatar_src ) {
                     avatar = $('<img class="avatar avatar-64 photo" width="64" height="64" />').attr( 'src', received.lock_error.avatar_src.replace(/&amp;/g, '&') );
@@ -285 +285 @@
                 }
 
-                wrap.show();
-            }
+                wrap.show().find('p.currently-editing').text( received.lock_error.text ).focus();
+            }
+        } else if ( received.new_lock ) {
+            $('#active_post_lock').val( received.new_lock );
         }
-
-        if ( received['new_lock'] )
-            $('#active_post_lock').val( received['new_lock'].replace(/[^0-9:]+/, '') );
     }
 });
@@ -300 +299 @@
 
     postboxes.add_postbox_toggles(pagenow);
+
+    // Post locks: if the Post Locked dialog is shown, focus it.
+    $('#notification-dialog:visible').find('p.currently-editing').focus();
 
     // multi-taxonomies