Changeset 23693

Timestamp:

03/14/2013 03:06:07 AM (13 years ago)

Author:

azaozz

Message:

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

Location:

trunk

Files:

• wp-admin/post.php (modified) (1 diff)
• wp-includes/js/autosave.js (modified) (5 diffs)

trunk/wp-admin/post.php

@@ -211 +211 @@
         $post_id = edit_post();
 
+        // Session cookie flag that the post was saved
+        if ( isset( $_COOKIE['wp-saving-post-' . $post_id] ) )
+                setcookie( 'wp-saving-post-' . $post_id, 'saved' );
+
         redirect_post($post_id); // Send user on their way while we keep working
 

trunk/wp-includes/js/autosave.js

@@ -476 +476 @@
                 }
 
-                // If the content and title are empty or did not change since the last save, don't save again
+                // If the content and title did not change since the last save, don't save again
                 if ( post_data.post_title + ': ' + post_data.content == this.lastsaveddata )
                         return false;
@@ -538 +538 @@
 
                 $('form#post').on('submit.autosave-local', function() {
-                        var editor = typeof tinymce != 'undefined' && tinymce.get('content');
+                        var editor = typeof tinymce != 'undefined' && tinymce.get('content'), post_id = $('#post_ID').val() || 0;
 
                         if ( editor && ! editor.isHidden() ) {
@@ -556 +556 @@
                                 });
                         }
+
+                        wpCookies.set( 'wp-saving-post-' + post_id, 'check' );
                 });
         },
 
         // Strip whitespace and compare two strings
-        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, '');
-                }
-
-                return ( remove( str1 || '', strip_tags ) == remove( str2 || '', strip_tags ) );
+        compare: function( str1, str2 ) {
+                function remove( string ) {
+                        return string.toString().replace(/[\x20\t\r\n\f]+/g, '');
+                }
+
+                return ( remove( str1 || '' ) == remove( str2 || '' ) );
         },
 
@@ -581 +578 @@
          */
         checkPost: function() {
-                var self = this, post_data = this.getData(), content, check_data, strip_tags = false, notice;
+                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 );
 
                 if ( ! post_data )
@@ -590 +588 @@
                         return;
 
-                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 ) )
-                        return;
-
-                // 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.
+                if ( cookie == 'saved' ) {
+                        return;
+                } else if ( cookie != 'check' ) {
+                        content = $('#content').val();
+                        check_data = $.extend( {}, post_data );
+
+                        if ( $('#wp-content-wrap').hasClass('tmce-active') )
+                                content = switchEditors.pre_wpautop( content );
+
+                        if ( this.compare( content, check_data.content ) && this.compare( $('#title').val(), check_data.post_title ) && this.compare( $('#excerpt').val(), check_data.excerpt ) )
+                                return;
+                }
 
                 this.restore_post_data = post_data;
                 this.undo_post_data = wp.autosave.getPostData();
-
-                /*
-                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.
-                }
-                */
 
                 notice = $('#local-storage-notice');