Changeset 23481

Timestamp:

02/25/2013 02:32:22 AM (14 years ago)

Author:

azaozz

Message:

Heartbeat API: add nopriv actions, add JS 'heartbeat-send' event, see #23216

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/js/heartbeat.js (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -68 +68 @@
 
 add_action( 'wp_ajax_nopriv_autosave', 'wp_ajax_nopriv_autosave', 1 );
+add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 
 if ( is_user_logged_in() )

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

@@ -2082 +2082 @@
         $response = array();
 
-        // screenid is the same as $current_screen->id and the JS global 'pagenow'
+        // screen_id 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']) ) {
                 $data = wp_unslash( (array) $_POST['data'] );
@@ -2107 +2107 @@
         $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);
 }
+
+function wp_ajax_nopriv_heartbeat() {
+        $response = array();
+
+        // screen_id 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']) ) {
+                $data = wp_unslash( (array) $_POST['data'] );
+                $response = apply_filters( 'heartbeat_nopriv_received', $response, $data, $screen_id );
+        }
+
+        $response = apply_filters( 'heartbeat_nopriv_send', $response, $screen_id );
+
+        // Allow the transport to be replaced with long-polling easily
+        do_action( 'heartbeat_nopriv_tick', $response, $screen_id );
+
+        // send the current time acording to the server
+        $response['servertime'] = time();
+
+        wp_send_json($response);
+}
+

trunk/wp-includes/general-template.php

@@ -2288 +2288 @@
  */
 function wp_heartbeat_settings( $settings ) {
-        $setting['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+        if ( is_user_logged_in() )
+                $setting['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+
         return $setting;
 }

trunk/wp-includes/js/heartbeat.js

@@ -96 +96 @@
 
                         data.data = $.extend( {}, queue );
+                        $(document).trigger( 'heartbeat-send', [data.data] );
 
                         data.interval = interval / 1000;