Ticket #25073: 25073-8.patch

src/wp-admin/includes/misc.php

@@ -739 +739 @@
         return $response;
 }
 add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 );
+
+/**
+ * Disable suspending of Heartbeat on the Add/Edit Post screens
+ *
+ * @since 3.8
+ */
+function _disable_heartbeat_suspend( $settings ) {
+        global $pagenow;
+
+        if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
+                $settings['suspend'] = 'disable';
+        }
+
+        return $settings;
+}
+add_filter( 'heartbeat_settings', '_disable_heartbeat_suspend' );

src/wp-includes/js/heartbeat.js

@@ -34 +34 @@
         var Heartbeat = function() {
                 var $document = $(document),
                         settings = {
-                                // Used to stop the "beat"
-                                isRunning: true,
+                                // Suspend/resume
+                                suspend: false,
 
+                                // Whether suspending is enabled
+                                suspendEnabled: true,
+
                                 // Current screen id, defaults to the JS global 'pagenow' when present (in the admin) or 'front'
                                 screenId: '',
 
@@ -128 +131 @@
                                 if ( ! settings.screenId ) {
                                         settings.screenId = options.screenId || 'front';
                                 }
+
+                                if ( options.suspend === 'disable' ) {
+                                        settings.suspendEnabled = false;
+                                }
                         }
 
                         // Convert to milliseconds
@@ -145 +152 @@
                                 focused();
                         }).on( 'unload.wp-heartbeat', function() {
                                 // Don't connect any more
-                                settings.isRunning = false;
+                                settings.suspend = 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 +286 @@
 
                         // 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.suspend ) {
                                 return;
                         }
 
@@ -351 +363 @@
                         var delta = time() - settings.lastTick,
                                 interval = settings.mainInterval;
 
-                        if ( ! settings.isRunning ) {
+                        if ( settings.suspend ) {
                                 return;
                         }
 
@@ -403 +415 @@
                         clearFocusTimers();
                         settings.userActivity = time();
 
+                        // Resume if suspended
+                        settings.suspend = false;
+
                         if ( ! settings.hasFocus ) {
                                 settings.hasFocus = true;
                                 scheduleNextTick();
@@ -513 +528 @@
                                 blurred();
                         }
 
+                        if ( settings.suspendEnabled && lastActive > 1800000 ) {
+                                // Suspend after 30 min. of inactivity
+                                settings.suspend = true;
+                        }
+
                         if ( ! settings.userActivityEvents ) {
                                 $document.on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } );
 
@@ -562 +582 @@
                 }
 
                 /**
+                 * Disable suspending
+                 *
+                 * Should be used only when Heartbeat is performing critical tasks like autosave, post-locking, etc.
+                 * Using this for non-crittical tasks may overload the user's hosting account if several
+                 * browser windows/tabs are left open for a long time.
+                 *
+                 * @return void
+                 */
+                function disableSuspend() {
+                        settings.suspendEnabled = false;
+                }
+
+                /**
                  * Get/Set the interval
                  *
                  * When setting to 'fast' or 5, by default interval is 5 sec. for the next 30 ticks (for 2 min and 30 sec).
@@ -691 +724 @@
                 return {
                         hasFocus: hasFocus,
                         connectNow: connectNow,
+                        disableSuspend: disableSuspend,
                         setInterval: setInterval,
                         hasConnectionError: hasConnectionError,
                         enqueue: enqueue,