Ticket #23220: disable_save_while_disconnected.3.diff

wp-admin/edit-form-advanced.php

@@ -336 +336 @@
 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

@@ -212 +212 @@
 }
 
 function autosave_enable_buttons() {
-        // delay that a bit to avoid some rare collisions while the DOM is being updated.
-        setTimeout(function(){
-                jQuery(':button, :submit', '#submitpost').removeAttr('disabled');
-                jQuery('.spinner', '#submitpost').hide();
-        }, 500);
+        if ( ! wp.heartbeat.connectionLost ) {
+                // delay that a bit to avoid some rare collisions while the DOM is being updated.
+                setTimeout(function(){
+                        jQuery(':button, :submit', '#submitpost').removeAttr('disabled');
+                        jQuery('.spinner', '#submitpost').hide();
+                }, 500);
+        }
 }
 
 function autosave_disable_buttons() {
@@ -239 +241 @@
         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();
@@ -664 +667 @@
 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() {