Ticket #23312: 23312-5.patch

wp-admin/edit.php

@@ -145 +145 @@
 $wp_list_table->prepare_items();
 
 wp_enqueue_script('inline-edit-post');
+wp_enqueue_script('edit-post');
 
 $title = $post_type_object->labels->name;
 

wp-admin/includes/class-wp-posts-list-table.php

@@ -555 +555 @@
 
                                 if ( $lock_holder && $can_edit_post && $post->post_status != 'trash' ) {
                                         printf( '<span class="lock-holder">%s</span>',
-                                                esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name )  ) );
+                                                esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) ) );
                                 }
 
                                 if ( ! $this->hierarchical_display && 'excerpt' == $mode && current_user_can( 'read_post', $post->ID ) )

wp-admin/includes/misc.php

@@ -561 +561 @@
         }
 }
 add_action('admin_head', '_ipad_meta');
+
+function wp_check_locked_posts( $response, $data ) {
+        $checked = array();
+
+        if ( array_key_exists('wp-check-locked', $data) ) {
+                foreach ( $data['wp-check-locked'] as $key ) {
+                        if ( $user_id = wp_check_post_lock( substr($key, 5) ) ) {
+                                if ( $user = get_userdata($user_id) )
+                                        $checked[$key] = sprintf( __( '%s is currently editing' ), $user->display_name );
+                        }
+                }
+        }
+
+        if ( !empty($checked) )
+                $response['wp-check-locked'] = $checked;
+
+        return $response;
+}
+add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 2 );

wp-admin/js/edit-post.js

@@ +1 @@
+(function($){
+        $( document ).on( 'heartbeat-tick.wp-check-locked', function( e, data ) {
+                var locked = data['wp-check-locked'] || {};
+                
+                $('#the-list tr').each( function(i, el) {
+                        var key = el.id, row = $(el);
+                        
+                        if ( locked.hasOwnProperty( key ) ) {
+                                if ( ! row.hasClass('wp-locked') )
+                                        row.addClass('wp-locked').find('.column-title strong').after( $('<span class="lock-holder" />').text(locked[key]) );
+                                        row.find('.check-column checkbox').prop('checked', false);
+                        } else if ( row.hasClass('wp-locked') ) {
+                                row.removeClass('wp-locked').find('.column-title span.lock-holder').remove();
+                        }
+                });
+        }).on( 'heartbeat-send.wp-check-locked', function( e, data ) {
+                var check = [];
+                
+                $('#the-list tr').each( function(i, el) {
+                        check.push( el.id );
+                });
+
+                data['wp-check-locked'] = check;
+        });
+}(jQuery));

wp-includes/script-loader.php

@@ -416 +416 @@
                 // @todo: Core no longer uses theme-preview.js. Remove?
                 $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), false, 1 );
 
+                $scripts->add( 'edit-post', "/wp-admin/js/edit-post$suffix.js", array( 'heartbeat' ), false, 1 );
+
                 $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), false, 1 );
                 did_action( 'init' ) && $scripts->localize( 'inline-edit-post', 'inlineEditL10n', array(
                         'error' => __('Error while saving the changes.'),