Changeset 24304

Timestamp:

05/20/2013 07:36:29 PM (11 years ago)

Author:

azaozz

Message:

Post locks:

• Change from IDs to classes for the notification-dialog divs so they can be reused.
• Do not check post locks if the dialog's html is not present.
• Do not check post locks if there is only one user on a single site install.

See #23697.

Location:

trunk/wp-admin

Files:

• css/wp-admin.css (modified) (3 diffs)
• includes/post.php (modified) (1 diff)
• js/post.js (modified) (4 diffs)
• post.php (modified) (1 diff)

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

@@ -3392 +3392 @@
 }
 
-#notification-dialog {
+.notification-dialog {
     position: fixed;
     top: 30%;
@@ -3403 +3403 @@
 }
 
-#notification-dialog-background {
+.notification-dialog-background {
     position: fixed;
     top: 0;
@@ -3415 +3415 @@
 }
 
-#notification-dialog .post-locked-message,
-#notification-dialog .post-taken-over {
+#post-lock-dialog .post-locked-message,
+#post-lock-dialog .post-taken-over {
     margin: 25px;
 }
 
-#notification-dialog .post-locked-message a.button {
+#post-lock-dialog .post-locked-message a.button {
     margin-right: 10px;
 }
 
-#notification-dialog .post-locked-avatar {
+#post-lock-dialog .post-locked-avatar {
     float: left;
     margin: 0 20px 20px 0;
 }
 
-#notification-dialog .wp-tab-first {
+#post-lock-dialog .wp-tab-first {
     outline: 0;
 }
 
-#notification-dialog .locked-saving img {
+#post-lock-dialog .locked-saving img {
     float: left;
     margin-right: 3px;
 }
 
-#notification-dialog-wrap.saving .locked-saving,
-#notification-dialog-wrap.saved .locked-saved {
+#post-lock-dialog.saving .locked-saving,
+#post-lock-dialog.saved .locked-saved {
     display: inline;
 }

trunk/wp-admin/includes/post.php

@@ -1203 +1203 @@
     }
 
-    $class = $locked ? '' : ' class="hidden"';
+    $hidden = $locked ? '' : ' hidden';
 
     ?>
-    <div id="notification-dialog-wrap"<?php echo $class; ?>>
-    <div id="notification-dialog-background"></div>
-    <div id="notification-dialog">
+    <div id="post-lock-dialog" class="notification-dialog-wrap<?php echo $hidden; ?>">
+    <div class="notification-dialog-background"></div>
+    <div class="notification-dialog">
     <?php
 

trunk/wp-admin/js/post.js

@@ -257 +257 @@
         send = {};
 
-    if ( !post_id )
+    if ( ! post_id || ! $('#post-lock-dialog').length )
         return;
 
@@ -277 +277 @@
         if ( received.lock_error ) {
             // show "editing taken over" message
-            wrap = $('#notification-dialog-wrap');
+            wrap = $('#post-lock-dialog');
 
             if ( wrap.length && ! wrap.is(':visible') ) {
@@ -306 +306 @@
             $('#active_post_lock').val( received.new_lock );
         }
-
-        if ( received.update_nonces ) {
-            $.each( received.update_nonces, function( selector, value ) {
-                if ( selector.match(/^replace-/) )
-                    $( '#' + selector.replace('replace-', '') ).val( value );
-            });
-        }
     }
 });
@@ -360 +353 @@
 
     // Post locks: contain focus inside the dialog. If the dialog is shown, focus the first item.
-    $('#notification-dialog').on( 'keydown', function(e) {
+    $('#post-lock-dialog .notification-dialog').on( 'keydown', function(e) {
         if ( e.which != 9 )
             return;

trunk/wp-admin/post.php

@@ -177 +177 @@
     }
 
-    add_action( 'admin_footer', '_admin_notice_post_locked' );
+    if ( is_multisite() ) {
+        add_action( 'admin_footer', '_admin_notice_post_locked' );
+    } else {
+        $check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+
+        if ( count( $check_users ) > 1 )
+            add_action( 'admin_footer', '_admin_notice_post_locked' );
+
+        unset( $check_users );
+    }
 
     $title = $post_type_object->labels->edit_item;