<!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>[23693] trunk: Local autosave: set a temp cookie on submitting the form and change it on redirecting after the post is saved/updated, then use it to determine if saving worked properly.</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/23693">23693</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-03-14 03:06:07 +0000 (Thu, 14 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Local autosave: set a temp cookie on submitting the form and change it on redirecting after the post is saved/updated, then use it to determine if saving worked properly. Removes the chance for false positives after saving/updating a post. See <a href="http://core.trac.wordpress.org/ticket/23220">#23220</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpostphp">trunk/wp-admin/post.php</a></li>
<li><a href="#trunkwpincludesjsautosavejs">trunk/wp-includes/js/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/post.php (23692 => 23693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/post.php 2013-03-13 23:54:12 UTC (rev 23692)
+++ trunk/wp-admin/post.php 2013-03-14 03:06:07 UTC (rev 23693)
</span><span class="lines">@@ -210,6 +210,10 @@
</span><span class="cx">
</span><span class="cx"> $post_id = edit_post();
</span><span class="cx">
</span><ins>+ // Session cookie flag that the post was saved
+ if ( isset( $_COOKIE['wp-saving-post-' . $post_id] ) )
+ setcookie( 'wp-saving-post-' . $post_id, 'saved' );
+
</ins><span class="cx"> redirect_post($post_id); // Send user on their way while we keep working
</span><span class="cx">
</span><span class="cx"> exit();
</span></span></pre></div>
<a id="trunkwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.js (23692 => 23693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.js 2013-03-13 23:54:12 UTC (rev 23692)
+++ trunk/wp-includes/js/autosave.js 2013-03-14 03:06:07 UTC (rev 23693)
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx"> $.extend( post_data, data );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If the content and title are empty or did not change since the last save, don't save again
</del><ins>+ // If the content and title did not change since the last save, don't save again
</ins><span class="cx"> if ( post_data.post_title + ': ' + post_data.content == this.lastsaveddata )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> $('form#post').on('submit.autosave-local', function() {
</span><del>- var editor = typeof tinymce != 'undefined' && tinymce.get('content');
</del><ins>+ var editor = typeof tinymce != 'undefined' && tinymce.get('content'), post_id = $('#post_ID').val() || 0;
</ins><span class="cx">
</span><span class="cx"> if ( editor && ! editor.isHidden() ) {
</span><span class="cx"> // Last onSubmit event in the editor, needs to run after the content has been moved to the textarea.
</span><span class="lines">@@ -555,21 +555,18 @@
</span><span class="cx"> excerpt: $('#excerpt').val() || ''
</span><span class="cx"> });
</span><span class="cx"> }
</span><ins>+
+ wpCookies.set( 'wp-saving-post-' + post_id, 'check' );
</ins><span class="cx"> });
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> // Strip whitespace and compare two strings
</span><del>- compare: function( str1, str2, strip_tags ) {
- function remove( string, strip_tags ) {
- string = string.toString();
-
- if ( strip_tags )
- string = string.replace(/<[^<>]+>/g, '');
-
- return string.replace(/[\x20\t\r\n\f]+/g, '');
</del><ins>+ compare: function( str1, str2 ) {
+ function remove( string ) {
+ return string.toString().replace(/[\x20\t\r\n\f]+/g, '');
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return ( remove( str1 || '', strip_tags ) == remove( str2 || '', strip_tags ) );
</del><ins>+ return ( remove( str1 || '' ) == remove( str2 || '' ) );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -580,7 +577,8 @@
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> checkPost: function() {
</span><del>- var self = this, post_data = this.getData(), content, check_data, strip_tags = false, notice;
</del><ins>+ var self = this, post_data = this.getData(), content, check_data, strip_tags = false, notice,
+ post_id = $('#post_ID').val() || 0, cookie = wpCookies.get( 'wp-saving-post-' + post_id );
</ins><span class="cx">
</span><span class="cx"> if ( ! post_data )
</span><span class="cx"> return;
</span><span class="lines">@@ -589,37 +587,22 @@
</span><span class="cx"> if ( $('#has-newer-autosave').length )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- content = $('#content').val();
- check_data = $.extend( {}, post_data );
-
- if ( $('#wp-content-wrap').hasClass('tmce-active') )
- content = switchEditors.pre_wpautop( content );
-
- // The post has just been published, only compare text
- if ( $('#post_status').val() == 'publish' && check_data.status != 'publish' )
- strip_tags = true;
-
- if ( this.compare( content, check_data.content, strip_tags ) && this.compare( $('#title').val(), check_data.post_title, strip_tags ) && this.compare( $('#excerpt').val(), check_data.excerpt, strip_tags ) )
</del><ins>+ if ( cookie == 'saved' ) {
</ins><span class="cx"> return;
</span><ins>+ } else if ( cookie != 'check' ) {
+ content = $('#content').val();
+ check_data = $.extend( {}, post_data );
</ins><span class="cx">
</span><del>- // We have three choices here:
- // - Do an autosave and then show the standard notice "There is an autosave newer than...".
- // - Offer to load/restore the backed up post data.
- // - Restore the post_data without asking, then show a notice with an Undo link/button.
- // Doing an autosave will take few seconds and may take up to 30 and fail if network connectivity is bad
- // Restoring the post will leave the user with the proper content, but it won't be saved to the server until the next autosave.
</del><ins>+ if ( $('#wp-content-wrap').hasClass('tmce-active') )
+ content = switchEditors.pre_wpautop( content );
</ins><span class="cx">
</span><ins>+ if ( this.compare( content, check_data.content ) && this.compare( $('#title').val(), check_data.post_title ) && this.compare( $('#excerpt').val(), check_data.excerpt ) )
+ return;
+ }
+
</ins><span class="cx"> this.restore_post_data = post_data;
</span><span class="cx"> this.undo_post_data = wp.autosave.getPostData();
</span><span class="cx">
</span><del>- /*
- if ( $('#post_status').val() == 'publish' ) {
- // Different message when a post is published?
- // Comparing the current and saved post data may fail (false positive) when the post is published
- // as in some cases there are changes to post_content on publishing and updating before saving to the DB.
- }
- */
-
</del><span class="cx"> notice = $('#local-storage-notice');
</span><span class="cx"> $('form#post').before( notice.addClass('updated').show() );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>