Ticket #23216: 23216-small-heartbeat-changes.2.diff

wp-includes/js/heartbeat.js

@@ -40 +40 @@
                         isUserActive,
                         userActiveEvents,
                         winBlurTimeout,
-                        frameBlurTimeout = -1;
+                        frameBlurTimeout = -1,
+                        hasActiveConnection = true;
 
-                this.autostart = true;
-                this.connectionLost = false;
+                /**
+                 * If a value is specified, this function will set the internal value of the `hasActiveConnection` setting.
+                 * Always returns the value of `hasActiveConnection`
+                 *
+                 * @param value (optional)
+                 * @returns boolean
+                 * @private
+                 */
+                this.hasActiveConnection = function( value ) {
+                        if ( typeof value === 'boolean' ) {
+                                return hasActiveConnection = value;
+                        }
 
+                        return hasActiveConnection;
+                };
+
                 if ( typeof( window.heartbeatSettings ) == 'object' ) {
                         settings = $.extend( {}, window.heartbeatSettings );
 
@@ -121 +135 @@
                                                 break;
                                 }
 
-                                if ( trigger && ! self.connectionLost ) {
-                                        self.connectionLost = true;
+                                if ( trigger && self.hasActiveConnection() === true ) {
+                                        self.hasActiveConnection( false );
                                         $(document).trigger( 'heartbeat-connection-lost', [error] );
                                 }
-                        } else if ( self.connectionLost ) {
+                        } else if ( self.hasActiveConnection() === false ) {
                                 errorcount = 0;
-                                self.connectionLost = false;
+                                self.hasActiveConnection( true );
                                 $(document).trigger( 'heartbeat-connection-restored' );
                         }
                 }
@@ -152 +166 @@
 
                         // If nothing to send (nothing is expecting a response),
                         // schedule the next tick and bail
-                        if ( empty && ! self.connectionLost ) {
+                        if ( empty && self.hasActiveConnection() === true ) {
                                 connecting = false;
                                 next();
                                 return;
@@ -179 +193 @@
                                         return errorstate( 'empty' );
 
                                 // Clear error state
-                                if ( self.connectionLost )
+                                if ( self.hasActiveConnection() === false )
                                         errorstate();
 
                                 if ( response.nonces_expired ) {
@@ -205 +219 @@
                                 errorstate( textStatus || 'unknown' );
                                 self.error( jqXHR, textStatus, error );
                         });
-                };
+                }
 
                 function next() {
                         var delta = time() - tick, t = interval;
@@ -332 +346 @@
 
                 // Check for user activity every 30 seconds.
                 window.setInterval( function(){ checkUserActive(); }, 30000 );
+                $(document).ready( function() {
+                        // Start one tick (15 sec) after DOM ready
+                        running = true;
+                        tick = time();
+                        next();
+                });
 
-                if ( this.autostart ) {
-                        $(document).ready( function() {
-                                // Start one tick (15 sec) after DOM ready
-                                running = true;
-                                tick = time();
-                                next();
-                        });
-                }
-
                 this.hasFocus = function() {
                         return hasFocus;
-                }
+                };
 
                 /**
                  * Get/Set the interval
@@ -401 +412 @@
                         return tempInterval ? tempInterval / 1000 : interval / 1000;
                 };
 
-                // Start. Has no effect if heartbeat is already running
-                this.start = function() {
-                        if ( running )
-                                return false;
-
-                        running = true;
-                        connect();
-                        return true;
-                };
-
-                // Stop. If a XHR is in progress, abort it
-                this.stop = function() {
-                        if ( self.xhr && self.xhr.readyState != 4 )
-                                self.xhr.abort();
-
-                        // Reset the error state
-                        errorstate();
-                        running = false;
-                        return true;
-                }
-
                 /**
                  * Enqueue data to send with the next XHR
                  *
@@ -447 +437 @@
                                 return true;
                         }
                         return false;
-                }
+                };
 
                 /**
                  * Check if data with a particular handle is queued
@@ -457 +447 @@
                  */
                 this.isQueued = function( handle ) {
                         return queue[handle];
-                }
-        }
+                };
+        };
 
         $.extend( Heartbeat.prototype, {
                 tick: function( data, textStatus, jqXHR ) {