Ticket #23220: disable_save_while_disconnected.2.diff

wp-admin/edit-form-advanced.php

@@ -329 +329 @@
 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 ?>
 
+<div id="lost-connection-notice" class="error hidden">
+        <p id="lost-connection-message">
+        <?php _e("You have lost your connection with the server, and saving has been disabled. This message will vanish once you've reconnected."); ?>
+        </p>
+</div>
+
 <div id="poststuff">
 
 <?php

wp-includes/js/autosave.js

@@ -180 +180 @@
 function autosave_saved(response) {
         blockSave = false;
         autosave_parse_response(response); // parse the ajax response
-        autosave_enable_buttons(); // re-enable disabled form buttons
+
+        if ( ! wp.heartbeat.connectionLost )
+                autosave_enable_buttons(); // re-enable disabled form buttons
 }
 
 // called when autosaving new post
@@ -200 +202 @@
                         autosaveDelayPreview = false;
                         doPreview();
                 }
-        } else {
+        } else if ( ! wp.heartbeat.connectionLost ) {
                 autosave_enable_buttons(); // re-enable disabled form buttons
         }
 }
@@ -238 +240 @@
 
 function autosave_disable_buttons() {
         jQuery(':button, :submit', '#submitpost').prop('disabled', true);
-        // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.
-        setTimeout(autosave_enable_buttons, 5000);
+
+        if ( ! wp.heartbeat.connectionLost ) {
+                // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.
+                setTimeout(autosave_enable_buttons, 5000);
+        }
 }
 
 function delayed_autosave() {
@@ -256 +261 @@
         var rich = (typeof tinymce != "undefined") && tinymce.activeEditor && !tinymce.activeEditor.isHidden(),
                 post_data, doAutoSave, ed, origStatus, successCallback;
 
+        // Disable buttons until we know the save completed.
         autosave_disable_buttons();
 
         post_data = wp.autosave.getPostData();
@@ -668 +674 @@
 wp.autosave.local.init();
 
 }(jQuery));
+
+
+// When connection is lost, keep user from submitting changes.
+jQuery(document).on('heartbeat-connection-lost', function() {
+        autosave_disable_buttons();
+        jQuery('#lost-connection-notice').show();
+});
+
+// When connection returns, make work all the things.
+jQuery(document).on('heartbeat-connection-restored', function() {
+        autosave_enable_buttons();
+        jQuery('#lost-connection-notice').hide();
+});

wp-includes/js/heartbeat.js

@@ -28 +28 @@
 
                 this.url = typeof ajaxurl != 'undefined' ? ajaxurl : 'wp-admin/admin-ajax.php';
                 this.autostart = true;
+                this.connectionLost = false;
 
                 if ( typeof( window.heartbeatSettings != 'undefined' ) ) {
                         settings = $.extend( {}, window.heartbeatSettings );
@@ -171 +172 @@
 
                         // temp debug
                         if ( self.debug )
-                                console.log('### blurred(), slow down...')
+                                console.log('### blurred(), slow down...');
                 }
 
                 function focused() {
@@ -192 +193 @@
 
                         // temp debug
                         if ( self.debug )
-                                console.log('### focused(), speed up... ')
+                                console.log('### focused(), speed up... ');
                 }
 
                 function setFrameEvents() {