Changeset 23355

Timestamp:

01/29/2013 06:15:25 AM (12 years ago)

Author:

azaozz

Message:

Heartbeat API: first run, see #23216

Location:

trunk

Files:

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

trunk/wp-admin/admin-ajax.php

@@ -57 +57 @@
     'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
     'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
-    'send-attachment-to-editor', 'save-attachment-order',
+    'send-attachment-to-editor', 'save-attachment-order', 'heartbeat',
 );
 

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

@@ -2072 +2072 @@
     wp_send_json_success( $html );
 }
+
+function wp_ajax_heartbeat() {
+    check_ajax_referer( 'heartbeat-nonce', '_nonce' );
+    $response = array( 'pagenow' => '' );
+
+    if ( ! empty($_POST['pagenow']) )
+        $response['pagenow'] = sanitize_key($_POST['pagenow']);
+    
+    if ( ! empty($_POST['data']) ) {
+        $data = (array) $_POST['data'];
+        // todo: how much to sanitize and preset and what to leave to be accessed from $data or $_POST..?
+        $user = wp_get_current_user();
+        $data['user_id'] = $user->exists() ? $user->ID : 0;
+
+        // 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 );
+
+    // 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();
+
+    wp_send_json($response);
+}

trunk/wp-includes/default-filters.php

@@ -291 +291 @@
 add_filter( 'default_option_embed_autourls', '__return_true' );
 
+// Default settings for heartbeat
+add_filter( 'heartbeat_settings', 'wp_heartbeat_settings' );
+
 unset($filter, $action);

trunk/wp-includes/general-template.php

@@ -2285 +2285 @@
     return $result;
 }
+
+/**
+ * Default settings for heartbeat
+ *
+ * Outputs the nonce used in the heartbeat XHR
+ *
+ * @since 3.6.0
+ *
+ * @param array $settings
+ * @return array $settings
+ */
+function wp_heartbeat_settings( $settings ) {
+    $setting['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+    return $setting;
+}

trunk/wp-includes/script-loader.php

@@ -108 +108 @@
 
     $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), false, 1 );
+    
+    $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );
+    did_action( 'init' ) && $scripts->localize( 'heartbeat', 'heartbeatSettings',
+        apply_filters( 'heartbeat_settings', array() )
+    );
 
     $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
@@ -372 +377 @@
         $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), false, 1 );
 
-        $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), false, 1 );
+        $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox', 'heartbeat'), false, 1 );
         did_action( 'init' ) && $scripts->localize( 'post', 'postL10n', array(
             'ok' => __('OK'),