Changeset 23382 for trunk/wp-admin/includes/ajax-actions.php

Timestamp:

02/03/2013 07:03:27 AM (14 years ago)

Author:

azaozz

Message:

Heartbeat API: throttle down when the window looses focus or when the user is inactive, always send 'screen_id', change the interval settings to 'fast' (5sec), 'standard' (15sec) and 'slow' (60sec), the interval can be changed from PHP, see #23216

File:

• trunk/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -2075 +2075 @@
 function wp_ajax_heartbeat() {
         check_ajax_referer( 'heartbeat-nonce', '_nonce' );
-        $response = array( 'pagenow' => '' );
-
-        if ( ! empty($_POST['pagenow']) )
-                $response['pagenow'] = sanitize_key($_POST['pagenow']);
+        $response = array();
+
+        // screenid is the same as $current_screen->id and the JS global 'pagenow'
+        if ( ! empty($_POST['screenid']) )
+                $screen_id = sanitize_key($_POST['screenid']);
+        else
+                $screen_id = 'site';
         
         if ( ! empty($_POST['data']) ) {
@@ -2088 +2091 @@
                 // todo: separate filters: 'heartbeat_[action]' so we call different callbacks only when there is data for them,
                 // or all callbacks listen to one filter and run when there is something for them in $data?
-                $response = apply_filters( 'heartbeat_received', $response, $data );
-        }
-
-        $response = apply_filters( 'heartbeat_send', $response );
+                $response = apply_filters( 'heartbeat_received', $response, $data, $screen_id );
+        }
+
+        $response = apply_filters( 'heartbeat_send', $response, $screen_id );
 
         // Allow the transport to be replaced with long-polling easily
-        do_action( 'heartbeat_tick', $response );
-
-        // always send the current time acording to the server
-        $response['time'] = time();
+        do_action( 'heartbeat_tick', $response, $screen_id );
+
+        // send the current time acording to the server
+        $response['servertime'] = time();
+
+        // Change the interval, format: array( speed, ticks )
+        if ( isset($response['heartbeat_interval']) )
+                $response['heartbeat_interval'] = (array) $response['heartbeat_interval'];
 
         wp_send_json($response);