Ticket #25073: 25073-7.patch

src/wp-includes/js/heartbeat.js

@@ -34 +34 @@
         var Heartbeat = function() {
                 var $document = $(document),
                         settings = {
-                                // Used to stop the "beat"
-                                isRunning: true,
+                                // Suspend/resume
+                                suspended: false,
 
                                 // Current screen id, defaults to the JS global 'pagenow' when present (in the admin) or 'front'
                                 screenId: '',
@@ -145 +145 @@
                                 focused();
                         }).on( 'unload.wp-heartbeat', function() {
                                 // Don't connect any more
-                                settings.isRunning = false;
+                                settings.suspended = true;
+
+                                // Abort the last request if not completed
+                                if ( settings.xhr && settings.xhr.readyState !== 4 ) {
+                                        settings.xhr.abort();
+                                }
                         });
 
                         // Check for user activity every 30 seconds.
@@ -274 +279 @@
 
                         // If the connection to the server is slower than the interval,
                         // heartbeat connects as soon as the previous connection's response is received.
-                        if ( settings.connecting ) {
+                        if ( settings.connecting || settings.suspended ) {
                                 return;
                         }
 
@@ -351 +356 @@
                         var delta = time() - settings.lastTick,
                                 interval = settings.mainInterval;
 
-                        if ( ! settings.isRunning ) {
+                        if ( settings.suspended ) {
                                 return;
                         }
 
@@ -403 +408 @@
                         clearFocusTimers();
                         settings.userActivity = time();
 
+                        // Resume if suspended
+                        settings.suspended = false;
+
                         if ( ! settings.hasFocus ) {
                                 settings.hasFocus = true;
                                 scheduleNextTick();
@@ -513 +521 @@
                                 blurred();
                         }
 
+                        if ( lastActive > 1800000 ) {
+                                // Suspend after 30 min. of inactivity
+                                settings.suspended = true;
+                        }
+
                         if ( ! settings.userActivityEvents ) {
                                 $document.on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } );