Ticket #25660: 25660.3.diff

src/wp-includes/js/autosave.js

@@ -141 +141 @@
         }
 
         // When connection is lost, keep user from submitting changes.
-        $(document).on('heartbeat-connection-lost.autosave', function( e, error ) {
-                if ( 'timeout' === error ) {
+        $(document).on('heartbeat-connection-lost.autosave', function( e, error, status ) {
+                if ( 'timeout' === error || 503 == status ) {
                         var notice = $('#lost-connection-notice');
                         if ( ! wp.autosave.local.hasStorage ) {
                                 notice.find('.hide-if-no-sessionstorage').hide();

src/wp-includes/js/heartbeat.js

@@ -45 +45 @@
                         userActiveEvents,
                         winBlurTimeout,
                         frameBlurTimeout = -1,
-                        hasConnectionError = false;
+                        hasConnectionError = null;
 
                 /**
                  * Returns a boolean that's indicative of whether or not there is a connection error
@@ -53 +53 @@
                  * @returns boolean
                  */
                 this.hasConnectionError = function() {
-                        return hasConnectionError;
+                        return !! hasConnectionError;
                 };
 
                 if ( typeof( window.heartbeatSettings ) == 'object' ) {
@@ -108 +108 @@
                 }
 
                 // Set error state and fire an event on XHR errors or timeout
-                function errorstate( error ) {
+                function errorstate( error, status ) {
                         var trigger;
 
                         if ( error ) {
@@ -132 +132 @@
                                                 break;
                                 }
 
+                                if ( 503 == status && false === hasConnectionError ) {
+                                        trigger = true;
+                                }
+
                                 if ( trigger && ! self.hasConnectionError() ) {
                                         hasConnectionError = true;
-                                        $(document).trigger( 'heartbeat-connection-lost', [error] );
+                                        $(document).trigger( 'heartbeat-connection-lost', [error, status] );
                                 }
                         } else if ( self.hasConnectionError() ) {
                                 errorcount = 0;
                                 hasConnectionError = false;
                                 $(document).trigger( 'heartbeat-connection-restored' );
+                        } else if ( null === hasConnectionError ) {
+                                hasConnectionError = false;
                         }
                 }
 
@@ -213 +219 @@
                                 connecting = false;
                                 next();
                         }).fail( function( jqXHR, textStatus, error ) {
-                                errorstate( textStatus || 'unknown' );
+                                errorstate( textStatus || 'unknown', jqXHR.status );
                                 self.error( jqXHR, textStatus, error );
                         });
                 }