Changeset 23796

Timestamp:

03/25/2013 11:43:06 PM (12 years ago)

Author:

azaozz

Message:

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 #23220

File:

• trunk/wp-includes/js/autosave.js (modified) (5 diffs)

trunk/wp-includes/js/autosave.js

@@ -424 +424 @@
 
     /**
-     * Set (save) post data in the storage
-     *
+     * Set (save or delete) post data in the storage.
+     *
+     * 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
      * @return bool
      */
@@ -434 +437 @@
             return false;
 
-        stored[ 'post_' + post_id ] = stored_data;
+        if ( stored_data )
+            stored[ 'post_' + post_id ] = stored_data;
+        else if ( stored.hasOwnProperty( 'post_' + post_id ) )
+            delete stored[ 'post_' + post_id ];
+        else
+            return false;
 
         return this.setStorage(stored);
@@ -471 +479 @@
 
         // temp logging
-        if ( this.debug )
-            console.log( 'saved, post content = %s', post_data.content );
+        if ( typeof console != 'undefined' )
+            console.log( 'Local autosave: saved, post content = %s', post_data.content );
 
         if ( result )
@@ -567 +575 @@
             post_id = $('#post_ID').val() || 0, cookie = wpCookies.get( 'wp-saving-post-' + post_id );
 
+        // temp logging
+        if ( typeof console != 'undefined' )
+            console.log( 'Local autosave: checkPost, cookie = %s, post content = %s', cookie, post_data && post_data.content );
+
         if ( ! post_data )
             return;
 
-        if ( cookie )
+        if ( cookie ) {
             wpCookies.remove( 'wp-saving-post-' + post_id );
+
+            if ( cookie == 'saved' ) {
+                // The post was saved properly, remove old data and bail
+                this.setData( false );
+                return;
+            }
+        }
 
         // There is a newer autosave. Don't show two "restore" notices at the same time.
@@ -577 +596 @@
             return;
 
-        // temp logging
-        if ( typeof console != 'undefined' )
-            console.log( 'checkPost, post content = %s', post_data.content );
-
-        if ( cookie == 'saved' ) {
-            return;
-        } else if ( cookie != 'check' ) {
+        // cookie == 'check' means the post was not saved properly, always show #local-storage-notice
+        if ( cookie != 'check' ) {
             content = $('#content').val();
             check_data = $.extend( {}, post_data );