Changeset 26549

Timestamp:

12/03/2013 12:44:22 AM (13 years ago)

Author:

azaozz

Message:

Heartbeat:

• Bring back heartbeat.interval().
• Rename wp_disable_heartbeat_suspend() to wp_heartbeat_set_suspension().
• Rename the option for disabling suspension from options.suspend to options.suspension.

Fixes #25073.

Location:

trunk/src

Files:

• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/js/inline-edit-post.js (modified) (1 diff)
• wp-admin/js/post.js (modified) (1 diff)
• wp-includes/js/heartbeat.js (modified) (4 diffs)

trunk/src/wp-admin/includes/misc.php

@@ -744 +744 @@
  * @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' );

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

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

trunk/src/wp-admin/js/post.js

@@ -378 +378 @@
         // 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 );
         }
 

trunk/src/wp-includes/js/heartbeat.js

@@ -133 +133 @@
                                 }
 
-                                if ( options.suspend === 'disable' ) {
+                                if ( options.suspension === 'disable' ) {
                                         settings.suspendEnabled = false;
                                 }
@@ -343 +343 @@
                                 // 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 ) {
@@ -606 +606 @@
                  * @return int Current interval in seconds
                  */
-                function setInterval( speed, ticks ) {
+                function interval( speed, ticks ) {
                         var interval, oldInerval = settings.tempInterval ? settings.tempInterval : settings.mainInterval;
 
@@ -726 +726 @@
                         connectNow: connectNow,
                         disableSuspend: disableSuspend,
-                        setInterval: setInterval,
+                        interval: interval,
                         hasConnectionError: hasConnectionError,
                         enqueue: enqueue,