Changeset 9225

Timestamp:

10/17/2008 09:44:22 AM (17 years ago)

Author:

azaozz

Message:

Comments post-box: show comments on the currently edited post with ajax, 20 at a time

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-admin/js/edit-comments.js (modified) (1 diff)
• wp-admin/js/post.js (modified) (3 diffs)
• wp-admin/wp-admin.css (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -441 +441 @@
         ) );
     }
+    $x->send();
+    break;
+case 'get-comments' :
+    check_ajax_referer( $action );
+
+    $post_ID = (int) $_POST['post_ID'];
+    if ( !current_user_can( 'edit_post', $post_ID ) )
+        die('-1');
+
+    $start = isset($_POST['start']) ? intval($_POST['start']) : 0;
+    $num = isset($_POST['num']) ? intval($_POST['num']) : 10;
+
+    list($comments, $total) = _wp_get_comment_list( false, false, $start, $num, $post_ID );
+
+    if ( !$comments )
+        die('1');
+
+    $comment_list_item = '';
+    $x = new WP_Ajax_Response();
+    foreach ( (array) $comments as $comment ) {
+        get_comment( $comment );
+        ob_start();
+            _wp_comment_row( $comment->comment_ID, 'single', false, false );
+            $comment_list_item .= ob_get_contents();
+        ob_end_clean();
+    }
+    $x->add( array(
+        'what' => 'comments',
+        'data' => $comment_list_item
+    ) );
     $x->send();
     break;

trunk/wp-admin/edit-form-advanced.php

@@ -342 +342 @@
 <?php
 
-    if ( !$post_ID || $post_ID < 0 )
+    if ( !$post_ID || $post_ID < 0 || 0 == $post->comment_count )
         return;
 
-    if ( !$comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $post_ID) ) )
-        return;
-
-    // Make sure comments, post, and post_author are cached
-//  update_comment_cache($comments);
-?>
-
-<table class="widefat">
+wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
+?>
+
+<table class="widefat comments-box" style="display:none;">
 <thead>
     <tr>
@@ -361 +357 @@
 </thead>
 <tbody id="the-comment-list" class="list:comment">
-<?php
-    foreach ($comments as $comment)
-        _wp_comment_row( $comment, 'single', false, false );
-?>
 </tbody>
 </table>
-
+<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get();return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p>
 <?php
 }

trunk/wp-admin/js/edit-comments.js

@@ -154 +154 @@
         t.o = '#comment-'+id;
 
-        $('#replyrow td').attr('colspan', $('.widefat tfoot th:visible').length);
+        $('#replyrow td').attr('colspan', $('.widefat thead th:visible').length);
         var editRow = $('#replyrow'), rowData = $('#inline-'+id);
         var act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';

trunk/wp-admin/js/post.js

@@ -203 +203 @@
     }
     });
-    
+
     $('.edit-post-status').click(function() {
         if ($('#post-status-select').is(":hidden")) {
@@ -217 +217 @@
         $('#post-status-display').html($('#post_status :selected').text());
         $('.edit-post-status').show();
-        
-        return false;
-    });
-    
+
+        return false;
+    });
+
     $('.cancel-post-status').click(function() {
         $('#post-status-select').slideUp("normal");
@@ -226 +226 @@
         $('#post-status-display').html($('#post_status :selected').text());
         $('.edit-post-status').show();
-        
+
         return false;
     });
 });
+
+(function($){
+    commentsBox = {
+        st : 0,
+
+        get : function(id, nonce) {
+            var st = this.st;
+            this.st += 20;
+
+            $('.waiting').show();
+
+            var data = {
+                'action' : 'get-comments',
+                'mode' : 'single',
+                '_ajax_nonce' : $('#add_comment_nonce').val(),
+                'post_ID' : $('#post_ID').val(),
+                'start' : st,
+                'num' : '20'
+            };
+
+            $.post('admin-ajax.php', data,
+                function(r) {
+                    var r = wpAjax.parseAjaxResponse(r);
+                    $('#commentstatusdiv .widefat').show();
+                    $('.waiting').hide();
+
+                    if ( 'object' == typeof r && r.responses[0] ) {
+                        $('#the-comment-list').append( r.responses[0].data );
+                        $('#the-comment-list .hide-if-no-js').removeClass('hide-if-no-js');
+
+                        theList = theExtraList = null;
+                        $("a[className*=':']").unbind();
+                        setCommentsList();
+                        $('#show-comments').html(postL10n.showcomm);
+                        return;
+                    } else if ( 1 == r ) {
+                        $('#show-comments').parent().html(postL10n.endcomm);
+                        return;
+                    }
+
+                    $('#the-comment-list').append('<tr><td colspan="5">'+wpAjax.broken+'</td></tr>');
+                }
+            );
+
+            return false;
+        }
+    }
+
+})(jQuery);
+

trunk/wp-admin/wp-admin.css

@@ -1082 +1082 @@
 .stuffbox .insidebox {
     margin: 11px 0;
+}
+
+#side-sortables .comments-box,
+#side-sortables #show-comments {
+    display: none;
 }
 
@@ -1976 +1981 @@
 
 #replysubmit img.waiting,
-.quick-edit-save img.waiting {
+.quick-edit-save img.waiting,
+#commentstatusdiv img.waiting {
     padding: 0 10px;
     vertical-align: top;

trunk/wp-includes/script-loader.php

@@ -184 +184 @@
             'cancel' => __('Cancel'),
             'edit' => __('Edit'),
+            'showcomm' => __('Show more comments'),
+            'endcomm' => __('No more comments found.')
         ) );
         $scripts->add( 'page', '/wp-admin/js/page.js', array('jquery', 'slug', 'postbox', 'settings-box'), '20080925' );