Changeset 24406

Timestamp:

06/05/2013 12:13:40 AM (13 years ago)

Author:

azaozz

Message:

Heartbeat: rename some vars/args to make them more intuitive, don't set user_id on every request, see #23216

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (4 diffs)
• wp-admin/includes/misc.php (modified) (3 diffs)
• wp-admin/js/inline-edit-post.js (modified) (3 diffs)
• wp-includes/js/heartbeat.js (modified) (5 diffs)

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

@@ -14 +14 @@
 
         // screen_id is the same as $current_screen->id and the JS global 'pagenow'
-        if ( ! empty($_POST['screenid']) )
-                $screen_id = sanitize_key($_POST['screenid']);
+        if ( ! empty($_POST['screen_id']) )
+                $screen_id = sanitize_key($_POST['screen_id']);
         else
-                $screen_id = 'site';
+                $screen_id = 'front';
 
         if ( ! empty($_POST['data']) ) {
@@ -30 +30 @@
 
         // send the current time according to the server
-        $response['servertime'] = time();
+        $response['server_time'] = time();
 
         wp_send_json($response);
@@ -2059 +2059 @@
 
         // screen_id is the same as $current_screen->id and the JS global 'pagenow'
-        if ( ! empty($_POST['screenid']) )
-                $screen_id = sanitize_key($_POST['screenid']);
+        if ( ! empty($_POST['screen_id']) )
+                $screen_id = sanitize_key($_POST['screen_id']);
         else
-                $screen_id = 'site';
+                $screen_id = 'front';
 
         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,
@@ -2081 +2078 @@
 
         // send the current time acording to the server
-        $response['servertime'] = time();
+        $response['server_time'] = time();
 
         wp_send_json($response);

trunk/wp-admin/includes/misc.php

@@ -570 +570 @@
         $checked = array();
 
-        if ( 'edit-post' == $screen_id && array_key_exists( 'wp-check-locked', $data ) && is_array( $data['wp-check-locked'] ) ) {
-                foreach ( $data['wp-check-locked'] as $key ) {
+        if ( 'edit-post' == $screen_id && array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
+                foreach ( $data['wp-check-locked-posts'] as $key ) {
                         $post_id = (int) substr( $key, 5 );
 
@@ -586 +586 @@
 
         if ( ! empty( $checked ) )
-                $response['wp-check-locked'] = $checked;
+                $response['wp-check-locked-posts'] = $checked;
 
         return $response;
@@ -602 +602 @@
                 $send = array();
 
-                if ( !$post_id = absint( $received['post_id'] ) )
+                if ( ! $post_id = absint( $received['post_id'] ) )
                         return $response;
 
-                if ( !current_user_can('edit_post', $post_id) )
+                if ( ! current_user_can('edit_post', $post_id) )
                         return $response;
 

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

@@ -294 +294 @@
 
 // Show/hide locks on posts
-$( document ).on( 'heartbeat-tick.wp-check-locked', function( e, data ) {
-        var locked = data['wp-check-locked'] || {};
+$( document ).on( 'heartbeat-tick.wp-check-locked-posts', function( e, data ) {
+        var locked = data['wp-check-locked-posts'] || {};
 
         $('#the-list tr').each( function(i, el) {
@@ -316 +316 @@
                 }
         });
-}).on( 'heartbeat-send.wp-check-locked', function( e, data ) {
+}).on( 'heartbeat-send.wp-check-locked-posts', function( e, data ) {
         var check = [];
 
@@ -325 +325 @@
 
         if ( check.length )
-                data['wp-check-locked'] = check;
+                data['wp-check-locked-posts'] = check;
 });
 

trunk/wp-includes/js/heartbeat.js

@@ -12 +12 @@
                         beat,
                         nonce,
-                        screenid = typeof pagenow != 'undefined' ? pagenow : '',
+                        screenId = typeof pagenow != 'undefined' ? pagenow : '',
                         url = typeof ajaxurl != 'undefined' ? ajaxurl : '',
                         settings,
@@ -43 +43 @@
                         interval = settings.interval || 15; // default interval
                         delete settings.interval;
-                        // The interval can be from 5 to 60 sec.
-                        if ( interval < 5 )
-                                interval = 5;
+                        // The interval can be from 15 to 60 sec. and can be set temporarily to 5 sec.
+                        if ( interval < 15 )
+                                interval = 15;
                         else if ( interval > 60 )
                                 interval = 60;
@@ -51 +51 @@
                         interval = interval * 1000;
 
-                        // 'screenid' can be added from settings on the front-end where the JS global 'pagenow' is not set
-                        screenid = screenid || settings.screenid || 'site';
-                        delete settings.screenid;
+                        // 'screenId' can be added from settings on the front-end where the JS global 'pagenow' is not set
+                        screenId = screenId || settings.screenId || 'front';
+                        delete settings.screenId;
 
                         // Add or overwrite public vars
@@ -84 +84 @@
                 }
 
-                // Set error state and fire an event if XHR errors or timeout
+                // Set error state and fire an event on XHR errors or timeout
                 function errorstate( error ) {
                         var trigger;
@@ -149 +149 @@
                         send._nonce = nonce;
                         send.action = 'heartbeat';
-                        send.screenid = screenid;
+                        send.screen_id = screenId;
                         send.has_focus = hasFocus;