Ticket #29386: 29386.patch

src/wp-admin/edit-form-advanced.php

@@ -388 +388 @@
         echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
 ?></h2>
 <?php if ( $notice ) : ?>
-<div id="notice" class="error"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
+<div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>
 <?php if ( $message ) : ?>
 <div id="message" class="updated"><p><?php echo $message; ?></p></div>

src/wp-includes/js/autosave.js

@@ -7 +7 @@
 ( function( $, window ) {
         function autosave() {
                 var initialCompareString,
-                lastTriggerSave = 0,
-                $document = $(document);
+                        lastTriggerSave = 0,
+                        $window = $( window ),
+                        $editorWindow = $(),
+                        $document = $( document );
 
                 /**
                  * Returns the data saved in both local and remote autosave
@@ -323 +325 @@
                                 }
 
                                 // There is a newer autosave. Don't show two "restore" notices at the same time.
-                                if ( $( '#has-newer-autosave' ).length ) {
+                                if ( $( '#notice' ).length ) {
                                         return;
                                 }
 
@@ -528 +530 @@
                         }).on( 'heartbeat-tick.autosave', function( event, data ) {
                                 if ( data.wp_autosave ) {
                                         response( data.wp_autosave );
+
+                                        $window.add( $editorWindow ).on( 'mousemove.autosave', function() {
+                                                var $notice = $( '#notice' );
+
+                                                window.scrollBy( 0, -$notice.outerHeight( true ) );
+                                                $notice.remove();
+                                                $window.add( $editorWindow ).off( 'mousemove.autosave' );
+                                        } );
                                 }
                         }).on( 'heartbeat-connection-lost.autosave', function( event, error, status ) {
                                 // When connection is lost, keep user from submitting changes.
@@ -567 +577 @@
                                         editor.save();
                                         initialCompareString = getCompareString();
                                 }, 1000 );
+
+                                $editorWindow = $( editor.getWin() );
                         }
                 }).ready( function() {
                         // Set the initial compare string in case TinyMCE is not used or not loaded first