Ticket #37025: 37025.patch

src/wp-admin/includes/template.php

@@ -2003 +2003 @@
  */
 function _local_storage_notice() {
         ?>
-        <div id="local-storage-notice" class="hidden notice">
+        <div id="local-storage-notice" class="hidden notice is-dismissible">
         <p class="local-restore">
-                <?php _e('The backup of this post in your browser is different from the version below.'); ?>
-                <a class="restore-backup" href="#"><?php _e('Restore the backup.'); ?></a>
+                <?php _e( 'The backup of this post in your browser is different from the version below.' ); ?>
+                <button type="button" class="button restore-backup"><?php _e('Restore the backup'); ?></button>
         </p>
-        <p class="undo-restore hidden">
-                <?php _e('Post restored successfully.'); ?>
-                <a class="undo-restore-backup" href="#"><?php _e('Undo.'); ?></a>
+        <p class="help">
+                <?php _e( 'This will replace the current editor content with the last backup version. Use undo in the editor to revert it.' ); ?>
         </p>
         </div>
         <?php

src/wp-includes/js/autosave.js

@@ -7 +7 @@
 ( function( $, window ) {
         function autosave() {
                 var initialCompareString,
-                lastTriggerSave = 0,
-                $document = $(document);
+                        lastTriggerSave = 0,
+                        $document = $(document);
 
                 /**
                  * Returns the data saved in both local and remote autosave
@@ -19 +19 @@
                         var post_name, parent_id, data,
                                 time = ( new Date() ).getTime(),
                                 cats = [],
-                                editor = typeof tinymce !== 'undefined' && tinymce.get('content');
+                                editor = getEditor();
 
                         // Don't run editor.save() more often than every 3 sec.
                         // It is resource intensive and might slow down typing in long posts on slow devices.
-                        if ( editor && ! editor.isHidden() && time - 3000 > lastTriggerSave ) {
+                        if ( editor && editor.isDirty() && ! editor.isHidden() && time - 3000 > lastTriggerSave ) {
                                 editor.save();
                                 lastTriggerSave = time;
                         }
@@ -88 +88 @@
                         $document.trigger( 'autosave-enable-buttons' );
                 }
 
+                function getEditor() {
+                        return typeof tinymce !== 'undefined' && tinymce.get('content');
+                }
+
                 // Autosave in localStorage
                 function autosaveLocal() {
-                        var restorePostData, undoPostData, blog_id, post_id, hasStorage, intervalTimer,
+                        var restorePostData, blog_id, post_id, hasStorage, intervalTimer,
                                 lastCompareString,
                                 isSuspended = false;
 
@@ -266 +270 @@
                                 intervalTimer = window.setInterval( save, 15000 );
 
                                 $( 'form#post' ).on( 'submit.autosave-local', function() {
-                                        var editor = typeof tinymce !== 'undefined' && tinymce.get('content'),
+                                        var editor = getEditor(),
                                                 post_id = $('#post_ID').val() || 0;
 
                                         if ( editor && ! editor.isHidden() ) {
@@ -323 +327 @@
                                         return;
                                 }
 
-                                // There is a newer autosave. Don't show two "restore" notices at the same time.
-                                if ( $( '#has-newer-autosave' ).length ) {
-                                        return;
-                                }
-
                                 content = $( '#content' ).val() || '';
                                 post_title = $( '#title' ).val() || '';
                                 excerpt = $( '#excerpt' ).val() || '';
@@ -339 +338 @@
                                 }
 
                                 restorePostData = postData;
-                                undoPostData = {
-                                        content: content,
-                                        post_title: post_title,
-                                        excerpt: excerpt
-                                };
 
+                                // If there is a "server" autosave notice, hide it.
+                                // The data in the session storage is fresher.
+                                $( '#has-newer-autosave' ).hide();
+
                                 $notice = $( '#local-storage-notice' )
                                         .insertAfter( $( '.wrap h1, .wrap h2' ).first() )
                                         .addClass( 'notice-warning' )
                                         .show();
 
-                                $notice.on( 'click.autosave-local', function( event ) {
-                                        var $target = $( event.target );
-
-                                        if ( $target.hasClass( 'restore-backup' ) ) {
-                                                restorePost( restorePostData );
-                                                $target.parent().hide();
-                                                $(this).find( 'p.undo-restore' ).show();
-                                                $notice.removeClass( 'notice-warning' ).addClass( 'notice-success' );
-                                        } else if ( $target.hasClass( 'undo-restore-backup' ) ) {
-                                                restorePost( undoPostData );
-                                                $target.parent().hide();
-                                                $(this).find( 'p.local-restore' ).show();
-                                                $notice.removeClass( 'notice-success' ).addClass( 'notice-warning' );
-                                        }
-
-                                        event.preventDefault();
+                                $notice.find( '.restore-backup' ).on( 'click.autosave-local', function() {
+                                        restorePost( postData );
                                 });
                         }
 
@@ -382 +366 @@
                                         }
 
                                         $( '#excerpt' ).val( postData.excerpt || '' );
-                                        editor = typeof tinymce !== 'undefined' && tinymce.get('content');
+                                        editor = getEditor();
 
                                         if ( editor && ! editor.isHidden() && typeof switchEditors !== 'undefined' ) {
+                                                if ( editor.settings.wpautop && postData.content ) {
+                                                        postData.content = switchEditors.wpautop( postData.content );
+                                                }
+
                                                 // Make sure there's an undo level in the editor
-                                                editor.undoManager.add();
-                                                editor.setContent( postData.content ? switchEditors.wpautop( postData.content ) : '' );
+                                                editor.undoManager.transact( function() {
+                                                        editor.setContent( postData.content || '' );
+                                                        editor.nodeChanged();
+                                                });
                                         } else {
                                                 // Make sure the Text editor is selected
                                                 $( '#content-html' ).click();
-                                                $( '#content' ).val( postData.content );
+                                                $( '#content' ).focus();
+                                                // Using document.execCommand() will let the user undo with Command/Ctrl + Z
+                                                document.execCommand( 'selectAll' );
+                                                document.execCommand( 'insertText', false, postData.content || '' );
                                         }
 
                                         return true;