Ticket #25073: 25073.3.patch

wp-admin/includes/post.php

@@ -1177 +1177 @@
         $time = $lock[0];
         $user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
 
-        $time_window = apply_filters( 'wp_check_post_lock_window', 120 );
+        $time_window = apply_filters( 'wp_check_post_lock_window', 150 );
 
         if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
                 return $user;

wp-includes/js/heartbeat.js

@@ -22 +22 @@
  * @since 3.6.0
  */
 
- // Ensure the global `wp` object exists.
-window.wp = window.wp || {};
-
-(function($){
+( function( $, window, undefined ) {
         var Heartbeat = function() {
-                var self = this,
-                        running,
-                        beat,
-                        screenId = typeof pagenow != 'undefined' ? pagenow : '',
-                        url = typeof ajaxurl != 'undefined' ? ajaxurl : '',
-                        settings,
-                        tick = 0,
-                        queue = {},
-                        interval,
-                        connecting,
-                        countdown = 0,
-                        errorcount = 0,
-                        tempInterval,
-                        hasFocus = true,
-                        isUserActive,
-                        userActiveEvents,
-                        winBlurTimeout,
-                        frameBlurTimeout = -1,
-                        hasConnectionError = false;
+                var $document = $(document);
+                var settings = {
+                        isRunning: true,
+                        screenId: '',
+                        url: '',
+                        lastTick: 0,
+                        queue: {},
+                        mainInterval: 0,
+                        tempInterval: 0,
+                        connecting: false,
+                        countdown: 0,
+                        errorcount: 0,
+                        hasFocus: true,
+                        userActivity: 0,
+                        userActiveEvents: false,
+                        connectionError: false,
+                        beatTimer: 0,
+                        winBlurTimer: 0,
+                        frameBlurTimer: 0
+                };
 
                 /**
-                 * Returns a boolean that's indicative of whether or not there is a connection error
+                 * Set local vars and events, then start
                  *
-                 * @returns boolean
+                 * @access private
+                 *
+                 * @return void
                  */
-                this.hasConnectionError = function() {
-                        return hasConnectionError;
-                };
+                function initialize() {
+                        if ( typeof window.pagenow != 'undefined' ) {
+                                settings.screenId = window.pagenow;
+                        }
 
-                if ( typeof( window.heartbeatSettings ) == 'object' ) {
-                        settings = $.extend( {}, window.heartbeatSettings );
+                        if ( typeof window.ajaxurl != 'undefined' ) {
+                                settings.url = window.ajaxurl;
+                        }
 
-                        // Add private vars
-                        url = settings.ajaxurl || url;
-                        delete settings.ajaxurl;
-                        delete settings.nonce;
+                        // Pull in options passed from PHP
+                        if ( typeof window.heartbeatSettings === 'object' ) {
+                                var options = window.heartbeatSettings;
 
-                        interval = settings.interval || 15; // default interval
-                        delete settings.interval;
-                        // The interval can be from 15 to 60 sec. and can be set temporarily to 5 sec.
-                        if ( interval < 15 )
-                                interval = 15;
-                        else if ( interval > 60 )
-                                interval = 60;
+                                // The XHR URL can be passed as option when window.ajaxurl is not set
+                                if ( ! settings.url && options.ajaxurl ) {
+                                        settings.url = options.ajaxurl;
+                                }
 
-                        interval = interval * 1000;
+                                // The interval can be from 15 to 60 sec. and can be set temporarily to 5 sec.
+                                settings.mainInterval = options.interval || 15;
 
-                        // 'screenId' can be added from settings on the front-end where the JS global 'pagenow' is not set
-                        screenId = screenId || settings.screenId || 'front';
-                        delete settings.screenId;
+                                if ( settings.mainInterval < 15 ) {
+                                        settings.mainInterval = 15;
+                                } else if ( settings.mainInterval > 60 ) {
+                                        settings.mainInterval = 60;
+                                }
 
-                        // Add or overwrite public vars
-                        $.extend( this, settings );
+                                // Convert to milliseconds
+                                settings.mainInterval = settings.mainInterval * 1000;
+
+                                // 'screenId' can be added from settings on the front-end where the JS global 'pagenow' is not set
+                                if ( ! settings.screenId ) {
+                                        settings.screenId = options.screenId || 'front';
+                                }
+                        }
+
+                        // Set focus/blur events on the window
+                        $(window).on( 'blur.wp-heartbeat-focus', function() {
+                                setFrameFocusEvents();
+                                // We don't know why the 'blur' was fired. Either the user clicked in an iframe or outside the browser.
+                                // Running blurred() after some timeout lets us cancel it if the user clicked in an iframe.
+                                settings.winBlurTimer = window.setTimeout( function(){ blurred(); }, 500 );
+                        }).on( 'focus.wp-heartbeat-focus', function() {
+                                removeFrameFocusEvents();
+                                focused();
+                        }).on( 'unload.wp-heartbeat', function() {
+                                // Don't connect any more
+                                settings.isRunning = false;
+                        });
+
+                        // Check for user activity every 30 seconds.
+                        window.setInterval( function(){ checkUserActive(); }, 30000 );
+
+                        // Start one tick after DOM ready
+                        $document.ready( function() {
+                                settings.lastTick = time();
+                                next();
+                        });
                 }
 
-                function time(s) {
-                        if ( s )
-                                return parseInt( (new Date()).getTime() / 1000 );
-
+                /**
+                 * Return the current time according to the browser
+                 *
+                 * @access private
+                 *
+                 * @return int
+                 */
+                function time() {
                         return (new Date()).getTime();
                 }
 
+                /**
+                 * Check if the iframe is from the same origin
+                 *
+                 * @access private
+                 *
+                 * @return bool
+                 */
                 function isLocalFrame( frame ) {
                         var origin, src = frame.src;
 
@@ -95 +136 @@
                         if ( src && /^https?:\/\//.test( src ) ) {
                                 origin = window.location.origin ? window.location.origin : window.location.protocol + '//' + window.location.host;
 
-                                if ( src.indexOf( origin ) !== 0 )
+                                if ( src.indexOf( origin ) !== 0 ) {
                                         return false;
+                                }
                         }
 
                         try {
-                                if ( frame.contentWindow.document )
+                                if ( frame.contentWindow.document ) {
                                         return true;
+                                }
                         } catch(e) {}
 
                         return false;
                 }
 
-                // Set error state and fire an event on XHR errors or timeout
-                function errorstate( error ) {
+                /**
+                 * Set error state and fire an event on XHR errors or timeout
+                 *
+                 * @access private
+                 *
+                 * @param string error The error type passed from the XHR
+                 * @return void
+                 */
+                function setErrorState( error ) {
                         var trigger;
 
                         if ( error ) {
@@ -124 +174 @@
                                         case 'error':
                                         case 'empty':
                                         case 'unknown':
-                                                errorcount++;
+                                                settings.errorcount++;
 
-                                                if ( errorcount > 2 )
+                                                if ( settings.errorcount > 2 ) {
                                                         trigger = true;
+                                                }
 
                                                 break;
                                 }
 
-                                if ( trigger && ! self.hasConnectionError() ) {
-                                        hasConnectionError = true;
-                                        $(document).trigger( 'heartbeat-connection-lost', [error] );
+                                if ( trigger && ! hasConnectionError() ) {
+                                        settings.connectionError = true;
+                                        $document.trigger( 'heartbeat-connection-lost', [error] );
                                 }
-                        } else if ( self.hasConnectionError() ) {
-                                errorcount = 0;
-                                hasConnectionError = false;
-                                $(document).trigger( 'heartbeat-connection-restored' );
                         }
                 }
 
+                /**
+                 * Clear the error state and fire an event
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
+                function clearErrorState() {
+                        if ( hasConnectionError() ) {
+                                settings.errorcount = 0;
+                                settings.connectionError = false;
+                                $document.trigger( 'heartbeat-connection-restored' );
+                        }
+                }
+
+                /**
+                 * Gather the data and connect to the server
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
                 function connect() {
-                        var send = {}, data, i, empty = true,
-                        nonce = typeof window.heartbeatSettings == 'object' ? window.heartbeatSettings.nonce : '';
-                        tick = time();
+                        var ajaxData, heartbeatData, i, empty = true;
 
-                        data = $.extend( {}, queue );
+                        // 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 ) {
+                                return;
+                        }
+
+                        settings.lastTick = time();
+
+                        heartbeatData = $.extend( {}, settings.queue );
                         // Clear the data queue, anything added after this point will be send on the next tick
-                        queue = {};
+                        settings.queue = {};
 
-                        $(document).trigger( 'heartbeat-send', [data] );
+                        $document.trigger( 'heartbeat-send', [ heartbeatData ] );
 
-                        for ( i in data ) {
-                                if ( data.hasOwnProperty( i ) ) {
+                        for ( i in heartbeatData ) {
+                                if ( heartbeatData.hasOwnProperty( i ) ) {
                                         empty = false;
                                         break;
                                 }
@@ -163 +238 @@
 
                         // If nothing to send (nothing is expecting a response),
                         // schedule the next tick and bail
-                        if ( empty && ! self.hasConnectionError() ) {
-                                connecting = false;
+                        if ( empty && ! hasConnectionError() ) {
                                 next();
                                 return;
                         }
 
-                        send.data = data;
-                        send.interval = interval / 1000;
-                        send._nonce = nonce;
-                        send.action = 'heartbeat';
-                        send.screen_id = screenId;
-                        send.has_focus = hasFocus;
+                        ajaxData = {
+                                data: heartbeatData,
+                                interval: settings.mainInterval / 1000,
+                                _nonce: typeof window.heartbeatSettings === 'object' ? window.heartbeatSettings.nonce : '',
+                                action: 'heartbeat',
+                                screen_id: settings.screenId,
+                                has_focus: settings.hasFocus
+                        };
 
-                        connecting = true;
-                        self.xhr = $.ajax({
-                                url: url,
+                        settings.connecting = true;
+                        settings.xhr = $.ajax({
+                                url: settings.url,
                                 type: 'post',
                                 timeout: 30000, // throw an error if not completed after 30 sec.
-                                data: send,
+                                data: ajaxData,
                                 dataType: 'json'
+                        }).always( function() {
+                                settings.connecting = false;
+                                next();
                         }).done( function( response, textStatus, jqXHR ) {
                                 var new_interval;
 
-                                if ( ! response )
-                                        return errorstate( 'empty' );
+                                if ( ! response ) {
+                                        setErrorState( 'empty' );
+                                        return;
+                                }
 
-                                // Clear error state
-                                if ( self.hasConnectionError() )
-                                        errorstate();
+                                clearErrorState();
 
                                 if ( response.nonces_expired ) {
-                                        $(document).trigger( 'heartbeat-nonces-expired' );
+                                        $document.trigger( 'heartbeat-nonces-expired' );
                                         return;
                                 }
 
@@ -204 +283 @@
                                         delete response.heartbeat_interval;
                                 }
 
-                                self.tick( response, textStatus, jqXHR );
+                                $document.trigger( 'heartbeat-tick', [response, textStatus, jqXHR] );
 
-                                // do this last, can trigger the next XHR if connection time > 5 sec. and new_interval == 'fast'
-                                if ( new_interval )
-                                        self.interval.call( self, new_interval );
-                        }).always( function() {
-                                connecting = false;
-                                next();
+                                // Do this last, can trigger the next XHR if connection time > 5 sec. and new_interval == 'fast'
+                                if ( new_interval ) {
+                                        setInterval( new_interval );
+                                }
                         }).fail( function( jqXHR, textStatus, error ) {
-                                errorstate( textStatus || 'unknown' );
-                                self.error( jqXHR, textStatus, error );
+                                setErrorState( textStatus || 'unknown' );
+                                $document.trigger( 'heartbeat-error', [jqXHR, textStatus, error] );
                         });
                 }
 
+                /**
+                 * Schedule the next connection
+                 *
+                 * Fires immediately if the connection time is longer than the interval.
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
                 function next() {
-                        var delta = time() - tick, t = interval;
+                        var delta = time() - settings.lastTick, interval = settings.mainInterval;
 
-                        if ( ! running )
+                        if ( ! settings.isRunning ) {
                                 return;
+                        }
 
-                        if ( ! hasFocus ) {
-                                t = 100000; // 100 sec. Post locks expire after 120 sec.
-                        } else if ( countdown > 0 && tempInterval ) {
-                                t = tempInterval;
-                                countdown--;
+                        if ( ! settings.hasFocus ) {
+                                interval = 120000; // 120 sec. Post locks expire after 150 sec.
+                        } else if ( settings.countdown > 0 && settings.tempInterval ) {
+                                interval = settings.tempInterval;
+                                settings.countdown--;
                         }
 
-                        window.clearTimeout(beat);
+                        window.clearTimeout( settings.beatTimer );
 
-                        if ( delta < t ) {
-                                beat = window.setTimeout(
+                        if ( delta < interval ) {
+                                settings.beatTimer = window.setTimeout(
                                         function(){
-                                                if ( running )
+                                                if ( settings.isRunning ) {
                                                         connect();
+                                                }
                                         },
-                                        t - delta
+                                        interval - delta
                                 );
                         } else {
                                 connect();
@@ -246 +334 @@
                         }
                 }
 
-                function blurred() {
-                        window.clearTimeout(winBlurTimeout);
-                        window.clearTimeout(frameBlurTimeout);
-                        winBlurTimeout = frameBlurTimeout = 0;
+                /**
+                 * Set the internal state when the browser window looses focus
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
+                function blurred() {    
 
-                        hasFocus = false;
+                        clearFocusTimers();
+                        settings.hasFocus = false;
                 }
 
+                /**
+                 * Set the internal state when the browser window is focused
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
                 function focused() {
-                        window.clearTimeout(winBlurTimeout);
-                        window.clearTimeout(frameBlurTimeout);
-                        winBlurTimeout = frameBlurTimeout = 0;
+                        clearFocusTimers();
+                        settings.userActivity = time();
 
-                        isUserActive = time();
-
-                        if ( hasFocus )
-                                return;
-
-                        hasFocus = true;
-                        window.clearTimeout(beat);
-
-                        if ( ! connecting )
+                        if ( ! settings.hasFocus ) {
+                                settings.hasFocus = true;
                                 next();
+                        }
                 }
 
-                function setFrameEvents() {
+                /**
+                 * Add focus/blur events to all local iframes
+                 *
+                 * Used to detect when focus is moved from the main window to an iframe
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
+                function setFrameFocusEvents() {
                         $('iframe').each( function( i, frame ){
-                                if ( ! isLocalFrame( frame ) )
+                                if ( ! isLocalFrame( frame ) ) {
                                         return;
+                                }
 
-                                if ( $.data( frame, 'wp-heartbeat-focus' ) )
+                                if ( $.data( frame, 'wp-heartbeat-focus' ) ) {
                                         return;
+                                }
 
                                 $.data( frame, 'wp-heartbeat-focus', 1 );
 
-                                $( frame.contentWindow ).on( 'focus.wp-heartbeat-focus', function(e) {
+                                $( frame.contentWindow ).on( 'focus.wp-heartbeat-focus', function() {
                                         focused();
-                                }).on('blur.wp-heartbeat-focus', function(e) {
-                                        setFrameEvents();
-                                        frameBlurTimeout = window.setTimeout( function(){ blurred(); }, 500 );
+                                }).on('blur.wp-heartbeat-focus', function() {
+                                        setFrameFocusEvents();
+                                        // We don't know why the 'blur' was fired. Either the user clicked in the main window or outside the browser.
+                                        // Running blurred() after some timeout lets us cancel it if the user clicked in the main window.
+                                        settings.frameBlurTimer = window.setTimeout( function(){ blurred(); }, 500 );
                                 });
                         });
                 }
-
-                $(window).on( 'blur.wp-heartbeat-focus', function(e) {
-                        setFrameEvents();
-                        winBlurTimeout = window.setTimeout( function(){ blurred(); }, 500 );
-                }).on( 'focus.wp-heartbeat-focus', function() {
+                
+                /**
+                 * Remove the focus/blur events to all local iframes
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
+                function removeFrameFocusEvents() {
                         $('iframe').each( function( i, frame ) {
-                                if ( !isLocalFrame( frame ) )
+                                if ( ! isLocalFrame( frame ) ) {
                                         return;
+                                }
 
                                 $.removeData( frame, 'wp-heartbeat-focus' );
                                 $( frame.contentWindow ).off( '.wp-heartbeat-focus' );
                         });
+                }
 
-                        focused();
-                });
+                /**
+                 * Clear the reset timers for focus/blur events on the window and iframes
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
+                function clearFocusTimers() {
+                        window.clearTimeout( settings.winBlurTimer );
+                        window.clearTimeout( settings.frameBlurTimer );
+                }
 
+                /**
+                 * Runs when the user becomes active after a period of inactivity
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
                 function userIsActive() {
-                        userActiveEvents = false;
-                        $(document).off( '.wp-heartbeat-active' );
+                        settings.isRunning = true;
+                        settings.userActiveEvents = false;
+                        $document.off( '.wp-heartbeat-active' );
+
                         $('iframe').each( function( i, frame ) {
-                                if ( ! isLocalFrame( frame ) )
+                                if ( ! isLocalFrame( frame ) ) {
                                         return;
+                                }
 
                                 $( frame.contentWindow ).off( '.wp-heartbeat-active' );
                         });
@@ -318 +449 @@
                         focused();
                 }
 
-                // Set 'hasFocus = true' if user is active and the window is in the background.
-                // Set 'hasFocus = false' if the user has been inactive (no mouse or keyboard activity) for 5 min. even when the window has focus.
+                /**
+                 * Check for user activity
+                 *
+                 * Runs every 30 sec.
+                 * Sets 'hasFocus = true' if user is active and the window is in the background.
+                 * Set 'hasFocus = false' if the user has been inactive (no mouse or keyboard activity)
+                 * for 5 min. even when the window has focus.
+                 *
+                 * @access private
+                 *
+                 * @return void
+                 */
                 function checkUserActive() {
-                        var lastActive = isUserActive ? time() - isUserActive : 0;
+                        var lastActive = settings.userActivity ? time() - settings.userActivity : 0;
 
-                        // Throttle down when no mouse or keyboard activity for 5 min
-                        if ( lastActive > 300000 && hasFocus )
-                                 blurred();
+                        if ( lastActive > 300000 && settings.hasFocus ) {
+                                // Throttle down when no mouse or keyboard activity for 5 min
+                                blurred();
+                        }
 
-                        if ( ! userActiveEvents ) {
-                                $(document).on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } );
+                        if ( lastActive > 900000 ) {
+                                // The user has been inactive for 15 min. Disable heartbeat.
+                                // This will also release the post lock.
+                                // When the user becomes active again, heartbeat will connect straight away.
+                                settings.isRunning = false;
+                        }
 
+                        if ( ! settings.userActiveEvents ) {
+                                $document.on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } );
+
                                 $('iframe').each( function( i, frame ) {
-                                        if ( ! isLocalFrame( frame ) )
+                                        if ( ! isLocalFrame( frame ) ) {
                                                 return;
+                                        }
 
                                         $( frame.contentWindow ).on( 'mouseover.wp-heartbeat-active keyup.wp-heartbeat-active', function(){ userIsActive(); } );
                                 });
 
-                                userActiveEvents = true;
+                                settings.userActiveEvents = true;
                         }
                 }
 
-                // 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();
-                });
+                // Public methods
 
-                this.hasFocus = function() {
-                        return hasFocus;
-                };
+                /**
+                 * Whether the window (or any local iframe in it) has focus, or the user is active
+                 *
+                 * @return bool
+                 */
+                function hasFocus() {
+                        return settings.hasFocus;
+                }
 
                 /**
+                 * Whether there is a connection error
+                 *
+                 * @return bool
+                 */
+                function hasConnectionError() {
+                        return settings.connectionError;
+                }
+
+                /**
+                 * Connect asap regardless of 'hasFocus'
+                 *
+                 * Will not open two concurrent connections. If a connection is in progress,
+                 * will connect again immediately after the current connection completes.
+                 *
+                 * @return void
+                 */
+                function connectNow() {
+                        settings.lastTick = 0;
+                        next();
+                }
+
+                /**
                  * Get/Set the interval
                  *
                  * When setting to 'fast', the interval is 5 sec. for the next 30 ticks (for 2 min and 30 sec).
@@ -364 +534 @@
                  * @param string ticks Used with speed = 'fast', how many ticks before the speed reverts back
                  * @return int Current interval in seconds
                  */
-                this.interval = function( speed, ticks ) {
-                        var reset, seconds;
+                function setInterval( speed, ticks ) {
+                        var seconds, oldInerval = settings.mainInterval;
+
                         ticks = parseInt( ticks, 10 ) || 30;
                         ticks = ticks < 1 || ticks > 30 ? 30 : ticks;
 
@@ -373 +544 @@
                                 switch ( speed ) {
                                         case 'fast':
                                                 seconds = 5;
-                                                countdown = ticks;
+                                                settings.countdown = ticks;
                                                 break;
                                         case 'slow':
                                                 seconds = 60;
-                                                countdown = 0;
+                                                settings.countdown = 0;
                                                 break;
                                         case 'long-polling':
                                                 // Allow long polling, (experimental)
-                                                interval = 0;
+                                                settings.mainInterval = 0;
                                                 return 0;
                                                 break;
                                         default:
                                                 seconds = 15;
-                                                countdown = 0;
+                                                settings.countdown = 0;
                                 }
 
-                                // Reset when the new interval value is lower than the current one
-                                reset = seconds * 1000 < interval;
-
-                                if ( countdown > 0 ) {
-                                        tempInterval = seconds * 1000;
+                                if ( settings.countdown > 0 ) {
+                                        settings.tempInterval = seconds * 1000;
                                 } else {
-                                        interval = seconds * 1000;
-                                        tempInterval = 0;
+                                        settings.mainInterval = seconds * 1000;
+                                        settings.tempInterval = 0;
                                 }
 
-                                if ( reset )
+                                // Change the next connection time if the new interval is different
+                                if ( seconds * 1000 != oldInerval ) {
+                                        settings.lastTick = settings.lastTick - ( oldInerval - seconds * 1000 );
                                         next();
+                                }
                         }
 
-                        if ( ! hasFocus )
+                        if ( ! settings.hasFocus ) {
                                 return 120;
+                        }
 
-                        return tempInterval ? tempInterval / 1000 : interval / 1000;
-                };
+                        return settings.tempInterval ? settings.tempInterval / 1000 : settings.mainInterval / 1000;
+                }
 
                 /**
                  * Enqueue data to send with the next XHR
@@ -425 +597 @@
                  * $param bool dont_overwrite Whether to overwrite existing data in the queue.
                  * $return bool Whether the data was queued or not.
                  */
-                this.enqueue = function( handle, data, dont_overwrite ) {
+                function enqueue( handle, data, dont_overwrite ) {
                         if ( handle ) {
-                                if ( dont_overwrite && this.isQueued( handle ) )
+                                if ( dont_overwrite && this.isQueued( handle ) ) {
                                         return false;
+                                }
 
-                                queue[handle] = data;
+                                settings.queue[handle] = data;
                                 return true;
                         }
                         return false;
-                };
+                }
 
                 /**
                  * Check if data with a particular handle is queued
@@ -442 +615 @@
                  * $param string handle The handle for the data
                  * $return bool Whether some data is queued with this handle
                  */
-                this.isQueued = function( handle ) {
-                        if ( handle )
-                                return queue.hasOwnProperty( handle );
-                };
+                function isQueued( handle ) {
+                        if ( handle ) {
+                                return settings.queue.hasOwnProperty( handle );
+                        }
+                }
 
                 /**
                  * Remove data with a particular handle from the queue
@@ -453 +627 @@
                  * $param string handle The handle for the data
                  * $return void
                  */
-                this.dequeue = function( handle ) {
-                        if ( handle )
-                                delete queue[handle];
-                };
+                function dequeue( handle ) {
+                        if ( handle ) {
+                                delete settings.queue[handle];
+                        }
+                }
 
                 /**
                  * Get data that was enqueued with a particular handle
@@ -464 +639 @@
                  * $param string handle The handle for the data
                  * $return mixed The data or undefined
                  */
-                this.getQueuedItem = function( handle ) {
-                        if ( handle )
+                function getQueuedItem( handle ) {
+                        if ( handle ) {
                                 return this.isQueued( handle ) ? queue[handle] : undefined;
+                        }
+                }
+
+                initialize();
+
+                // Expose publick methods
+                return {
+                        hasFocus: hasFocus,
+                        connectNow: connectNow,
+                        setInterval: setInterval,
+                        hasConnectionError: hasConnectionError,
+                        enqueue: enqueue,
+                        dequeue: dequeue,
+                        isQueued: isQueued,
+                        getQueuedItem: getQueuedItem
                 };
         };
 
-        $.extend( Heartbeat.prototype, {
-                tick: function( data, textStatus, jqXHR ) {
-                        $(document).trigger( 'heartbeat-tick', [data, textStatus, jqXHR] );
-                },
-                error: function( jqXHR, textStatus, error ) {
-                        $(document).trigger( 'heartbeat-error', [jqXHR, textStatus, error] );
-                }
-        });
+        // Ensure the global `wp` object exists.
+        window.wp = window.wp || {};
+        window.wp.heartbeat = new Heartbeat();
 
-        wp.heartbeat = new Heartbeat();
-
-}(jQuery));
+}( jQuery, window ));