<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[24042] trunk: Post locks:</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24042">24042</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-04-22 03:08:51 +0000 (Mon, 22 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsswpadmincss">trunk/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunkwpadminincludesmiscphp">trunk/wp-admin/includes/misc.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminjspostjs">trunk/wp-admin/js/post.js</a></li>
<li><a href="#trunkwpincludesjsautosavejs">trunk/wp-includes/js/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.css (24041 => 24042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.css 2013-04-19 22:58:38 UTC (rev 24041)
+++ trunk/wp-admin/css/wp-admin.css 2013-04-22 03:08:51 UTC (rev 24042)
</span><span class="lines">@@ -3399,6 +3399,7 @@
</span><span class="cx"> width: 450px;
</span><span class="cx"> margin-left: -225px;
</span><span class="cx"> background: #fff;
</span><ins>+ line-height: 1.5;
</ins><span class="cx"> z-index: 1000005;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3425,15 +3426,23 @@
</span><span class="cx">
</span><span class="cx"> #notification-dialog .post-locked-avatar {
</span><span class="cx"> float: left;
</span><del>- margin-right: 20px;
</del><ins>+ margin: 0 20px 20px 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#notification-dialog .currently-editing {
- margin-bottom: 20px;
</del><ins>+#notification-dialog .wp-tab-first {
</ins><span class="cx"> outline: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#notification-dialog .locked-saving img {
+ float: left;
+ margin-right: 3px;
+}
</ins><span class="cx">
</span><ins>+#notification-dialog-wrap.saving .locked-saving,
+#notification-dialog-wrap.saved .locked-saved {
+ display: inline;
+}
+
</ins><span class="cx"> /*------------------------------------------------------------------------------
</span><span class="cx"> 11.1 - Custom Fields
</span><span class="cx"> ------------------------------------------------------------------------------*/
</span></span></pre></div>
<a id="trunkwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/misc.php (24041 => 24042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/misc.php 2013-04-19 22:58:38 UTC (rev 24041)
+++ trunk/wp-admin/includes/misc.php 2013-04-22 03:08:51 UTC (rev 24042)
</span><span class="lines">@@ -574,12 +574,11 @@
</span><span class="cx"> $post_id = (int) substr( $key, 5 );
</span><span class="cx">
</span><span class="cx"> if ( current_user_can( 'edit_post', $post_id ) && ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
</span><del>- $send = array();
</del><ins>+ $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
</ins><span class="cx">
</span><span class="cx"> if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
</span><span class="cx"> $send['avatar_src'] = $matches[1];
</span><span class="cx">
</span><del>- $send['text'] = sprintf( __( '%s is currently editing' ), $user->display_name );
</del><span class="cx"> $checked[$key] = $send;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -608,9 +607,7 @@
</span><span class="cx"> if ( !current_user_can('edit_post', $post_id) )
</span><span class="cx"> return $response;
</span><span class="cx">
</span><del>- if ( $user_id = wp_check_post_lock( $post_id ) ) {
- $user = get_userdata( $user_id );
-
</del><ins>+ if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
</ins><span class="cx"> $error = array(
</span><span class="cx"> 'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (24041 => 24042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2013-04-19 22:58:38 UTC (rev 24041)
+++ trunk/wp-admin/includes/post.php 2013-04-22 03:08:51 UTC (rev 24042)
</span><span class="lines">@@ -1197,8 +1197,7 @@
</span><span class="cx"> if ( ! $post = get_post() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if ( $user = wp_check_post_lock( $post->ID ) ) {
- $user = get_userdata( $user );
</del><ins>+ if ( ( $user_id = wp_check_post_lock( $post->ID ) ) && ( $user = get_userdata( $user_id ) ) ) {
</ins><span class="cx"> $locked = apply_filters( 'show_post_locked_dialog', true, $post, $user );
</span><span class="cx"> } else {
</span><span class="cx"> $locked = false;
</span><span class="lines">@@ -1229,6 +1228,7 @@
</span><span class="cx"> <div class="post-locked-message">
</span><span class="cx"> <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
</span><span class="cx"> <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>
</span><ins>+ <?php do_action( 'post_lock_text', $post ); ?>
</ins><span class="cx"> <p>
</span><span class="cx"> <a class="button" href="<?php echo esc_url( wp_get_referer() ); ?>"><?php _e('Go back'); ?></a>
</span><span class="cx"> <a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e('Preview'); ?></a>
</span><span class="lines">@@ -1249,7 +1249,12 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="post-taken-over">
</span><span class="cx"> <div class="post-locked-avatar"></div>
</span><del>- <p class="currently-editing wp-tab-first" tabindex="0"></p>
</del><ins>+ <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 ); ?>
</ins><span class="cx"> <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>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminjspostjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post.js (24041 => 24042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post.js 2013-04-19 22:58:38 UTC (rev 24041)
+++ trunk/wp-admin/js/post.js 2013-04-22 03:08:51 UTC (rev 24042)
</span><span class="lines">@@ -277,15 +277,26 @@
</span><span class="cx"> wrap = $('#notification-dialog-wrap');
</span><span class="cx">
</span><span class="cx"> if ( wrap.length && ! wrap.is(':visible') ) {
</span><del>- if ( typeof autosave == 'function' )
</del><ins>+ 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
</ins><span class="cx"> autosave();
</span><ins>+ autosave = function(){};
+ }
</ins><span class="cx">
</span><span class="cx"> if ( received.lock_error.avatar_src ) {
</span><span class="cx"> avatar = $('<img class="avatar avatar-64 photo" width="64" height="64" />').attr( 'src', received.lock_error.avatar_src.replace(/&amp;/g, '&') );
</span><span class="cx"> wrap.find('div.post-locked-avatar').empty().append( avatar );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- wrap.show().find('p.currently-editing').text( received.lock_error.text ).focus();
</del><ins>+ wrap.show().find('.currently-editing').text( received.lock_error.text );
+ wrap.find('.wp-tab-first').focus();
</ins><span class="cx"> }
</span><span class="cx"> } else if ( received.new_lock ) {
</span><span class="cx"> $('#active_post_lock').val( received.new_lock );
</span></span></pre></div>
<a id="trunkwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.js (24041 => 24042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.js 2013-04-19 22:58:38 UTC (rev 24041)
+++ trunk/wp-includes/js/autosave.js 2013-04-22 03:08:51 UTC (rev 24042)
</span><span class="lines">@@ -227,6 +227,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function autosave_enable_buttons() {
</span><ins>+ jQuery(document).trigger('autosave-enable-buttons');
</ins><span class="cx"> if ( ! wp.heartbeat.connectionLost ) {
</span><span class="cx"> // delay that a bit to avoid some rare collisions while the DOM is being updated.
</span><span class="cx"> setTimeout(function(){
</span><span class="lines">@@ -238,6 +239,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function autosave_disable_buttons() {
</span><ins>+ jQuery(document).trigger('autosave-disable-buttons');
</ins><span class="cx"> jQuery('#submitpost').find(':button, :submit').prop('disabled', true);
</span><span class="cx"> // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.
</span><span class="cx"> setTimeout( autosave_enable_buttons, 5000 );
</span></span></pre>
</div>
</div>
</body>
</html>