Ticket #25073: 25073-9.patch

src/wp-admin/includes/misc.php

@@ -743 +743 @@
  *
  * @since 3.8
  */
-function wp_disable_heartbeat_suspend( $settings ) {
+function wp_heartbeat_set_suspension( $settings ) {
         global $pagenow;
 
         if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
-                $settings['suspend'] = 'disable';
+                $settings['suspension'] = 'disable';
         }
 
         return $settings;
 }
-add_filter( 'heartbeat_settings', 'wp_disable_heartbeat_suspend' );
+add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );

src/wp-admin/js/inline-edit-post.js

@@ -352 +352 @@
 }).ready( function() {
         // Set the heartbeat interval to 15 sec.
         if ( typeof wp !== 'undefined' && wp.heartbeat ) {
-                wp.heartbeat.setInterval( 15 );
+                wp.heartbeat.interval( 15 );
         }
 });
 

src/wp-admin/js/post.js

@@ -377 +377 @@
         
         // Set the heartbeat interval to 15 sec. if post lock dialogs are enabled
         if ( typeof wp !== 'undefined' && wp.heartbeat && $('#post-lock-dialog').length ) {
-                wp.heartbeat.setInterval( 15 );
+                wp.heartbeat.interval( 15 );
         }
 
         // multi-taxonomies

src/wp-includes/js/heartbeat.js

@@ -132 +132 @@
                                         settings.screenId = options.screenId || 'front';
                                 }
 
-                                if ( options.suspend === 'disable' ) {
+                                if ( options.suspension === 'disable' ) {
                                         settings.suspendEnabled = false;
                                 }
                         }
@@ -342 +342 @@
 
                                 // Do this last, can trigger the next XHR if connection time > 5 sec. and newInterval == 'fast'
                                 if ( newInterval ) {
-                                        setInterval( newInterval );
+                                        interval( newInterval );
                                 }
                         }).fail( function( jqXHR, textStatus, error ) {
                                 setErrorState( textStatus || 'unknown', jqXHR.status );
@@ -605 +605 @@
                  * @param string ticks Used with speed = 'fast' or 5, how many ticks before the interval reverts back
                  * @return int Current interval in seconds
                  */
-                function setInterval( speed, ticks ) {
+                function interval( speed, ticks ) {
                         var interval, oldInerval = settings.tempInterval ? settings.tempInterval : settings.mainInterval;
 
                         if ( speed ) {
@@ -725 +725 @@
                         hasFocus: hasFocus,
                         connectNow: connectNow,
                         disableSuspend: disableSuspend,
-                        setInterval: setInterval,
+                        interval: interval,
                         hasConnectionError: hasConnectionError,
                         enqueue: enqueue,
                         dequeue: dequeue,