<!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>[23796] trunk/wp-includes/js/autosave.js: Local autosave: remove the locally stored data after a post is saved.</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/23796">23796</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-03-25 23:43:06 +0000 (Mon, 25 Mar 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Local autosave: remove the locally stored data after a post is saved. This prevents false positives when several users edit the same post multiple times. See <a href="http://core.trac.wordpress.org/ticket/23220">#23220</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsautosavejs">trunk/wp-includes/js/autosave.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsautosavejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.js (23795 => 23796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.js        2013-03-25 16:36:27 UTC (rev 23795)
+++ trunk/wp-includes/js/autosave.js        2013-03-25 23:43:06 UTC (rev 23796)
</span><span class="lines">@@ -423,8 +423,11 @@
</span><span class="cx">         },
</span><span class="cx">
</span><span class="cx">         /**
</span><del>-         * Set (save) post data in the storage
</del><ins>+         * Set (save or delete) post data in the storage.
</ins><span class="cx">          *
</span><ins>+         * If stored_data evaluates to 'false' the storage key for the current post will be removed
+         *
+         * $param stored_data The post data to store or null/false/empty to delete the key
</ins><span class="cx">          * @return bool
</span><span class="cx">          */
</span><span class="cx">         setData: function( stored_data ) {
</span><span class="lines">@@ -433,7 +436,12 @@
</span><span class="cx">                 if ( !stored || !post_id )
</span><span class="cx">                         return false;
</span><span class="cx">
</span><del>-                stored[ 'post_' + post_id ] = stored_data;
</del><ins>+                if ( stored_data )
+                        stored[ 'post_' + post_id ] = stored_data;
+                else if ( stored.hasOwnProperty( 'post_' + post_id ) )
+                        delete stored[ 'post_' + post_id ];
+                else
+                        return false;
</ins><span class="cx">
</span><span class="cx">                 return this.setStorage(stored);
</span><span class="cx">         },
</span><span class="lines">@@ -470,8 +478,8 @@
</span><span class="cx">                 result = this.setData( post_data );
</span><span class="cx">
</span><span class="cx">                 // temp logging
</span><del>-                if ( this.debug )
-                        console.log( 'saved, post content = %s', post_data.content );
</del><ins>+                if ( typeof console != 'undefined' )
+                        console.log( 'Local autosave: saved, post content = %s', post_data.content );
</ins><span class="cx">
</span><span class="cx">                 if ( result )
</span><span class="cx">                         this.lastsaveddata = post_data.post_title + ': ' + post_data.content;
</span><span class="lines">@@ -566,23 +574,29 @@
</span><span class="cx">                 var self = this, post_data = this.getData(), content, check_data, strip_tags = false, notice,
</span><span class="cx">                         post_id = $('#post_ID').val() || 0, cookie = wpCookies.get( 'wp-saving-post-' + post_id );
</span><span class="cx">
</span><ins>+                // temp logging
+                if ( typeof console != 'undefined' )
+                        console.log( 'Local autosave: checkPost, cookie = %s, post content = %s', cookie, post_data && post_data.content );
+
</ins><span class="cx">                 if ( ! post_data )
</span><span class="cx">                         return;
</span><span class="cx">
</span><del>-                if ( cookie )
</del><ins>+                if ( cookie ) {
</ins><span class="cx">                         wpCookies.remove( 'wp-saving-post-' + post_id );
</span><span class="cx">
</span><ins>+                        if ( cookie == 'saved' ) {
+                                // The post was saved properly, remove old data and bail
+                                this.setData( false );
+                                return;
+                        }
+                }
+
</ins><span class="cx">                 // There is a newer autosave. Don't show two "restore" notices at the same time.
</span><span class="cx">                 if ( $('#has-newer-autosave').length )
</span><span class="cx">                         return;
</span><span class="cx">
</span><del>-                // temp logging
-                if ( typeof console != 'undefined' )
-                        console.log( 'checkPost, post content = %s', post_data.content );
-
-                if ( cookie == 'saved' ) {
-                        return;
-                } else if ( cookie != 'check' ) {
</del><ins>+                // cookie == 'check' means the post was not saved properly, always show #local-storage-notice
+                if ( cookie != 'check' ) {
</ins><span class="cx">                         content = $('#content').val();
</span><span class="cx">                         check_data = $.extend( {}, post_data );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>