Changeset 25874

Timestamp:

10/22/2013 09:26:04 PM (12 years ago)

Author:

nacin

Message:

Have heartbeat's connection lost notice handle 503 errors send by the upgrader's maintenance mode.

fixes #25660 for 3.7.

Location:

trunk/src/wp-includes/js

Files:

• autosave.js (modified) (1 diff)
• heartbeat.js (modified) (6 diffs)

trunk/src/wp-includes/js/autosave.js

@@ -142 +142 @@
 
     // 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 ) {

trunk/src/wp-includes/js/heartbeat.js

@@ -46 +46 @@
             winBlurTimeout,
             frameBlurTimeout = -1,
-            hasConnectionError = false;
+            hasConnectionError = null;
 
         /**
@@ -54 +54 @@
          */
         this.hasConnectionError = function() {
-            return hasConnectionError;
+            return !! hasConnectionError;
         };
 
@@ -109 +109 @@
 
         // Set error state and fire an event on XHR errors or timeout
-        function errorstate( error ) {
+        function errorstate( error, status ) {
             var trigger;
 
@@ -133 +133 @@
                 }
 
+                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() ) {
@@ -141 +145 @@
                 hasConnectionError = false;
                 $(document).trigger( 'heartbeat-connection-restored' );
+            } else if ( null === hasConnectionError ) {
+                hasConnectionError = false;
             }
         }
@@ -214 +220 @@
                 next();
             }).fail( function( jqXHR, textStatus, error ) {
-                errorstate( textStatus || 'unknown' );
+                errorstate( textStatus || 'unknown', jqXHR.status );
                 self.error( jqXHR, textStatus, error );
             });