Changeset 9241

Timestamp:

10/18/2008 05:00:20 PM (16 years ago)

Author:

azaozz

Message:

Comments post-box: show 10 comments at load only if the postbox is not hidden

Location:

trunk

Files:

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

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

@@ -341 +341 @@
 </p>
 <?php
-
-    if ( !$post_ID || $post_ID < 0 || 0 == $post->comment_count )
+    $total = $wpdb->get_var($wpdb->prepare("SELECT count(1) FROM $wpdb->comments WHERE comment_post_ID = '%d' AND ( comment_approved = '0' OR comment_approved = '1')", $post_ID));
+
+    if ( !$post_ID || $post_ID < 0 || 1 > $total )
         return;
 
@@ -359 +360 @@
 </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
+<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p>
+<?php
+    $hidden = (array) get_user_option( "meta-box-hidden_post" );
+    if ( ! in_array('commentstatusdiv', $hidden) ) { ?>
+        <script type="text/javascript">commentsBox.get(<?php echo $total; ?>, 10);</script>
+<?php
+    }
 }
 add_meta_box('commentstatusdiv', __('Comments on this Post'), 'post_comment_status_meta_box', 'post', 'normal', 'core');

trunk/wp-admin/js/post.js

@@ -235 +235 @@
         st : 0,
 
-        get : function(id, nonce) {
+        get : function(total, num) {
             var st = this.st;
-            this.st += 20;
-
+            if ( ! num )
+                num = 20;
+
+            this.st += num;
+            this.total = total;
             $('.waiting').show();
 
@@ -247 +250 @@
                 'post_ID' : $('#post_ID').val(),
                 'start' : st,
-                'num' : '20'
+                'num' : num
             };
 
@@ -263 +266 @@
                         $("a[className*=':']").unbind();
                         setCommentsList();
-                        $('#show-comments').html(postL10n.showcomm);
+
+                        if ( commentsBox.st > commentsBox.total )
+                            $('#show-comments').hide();
+                        else
+                            $('#show-comments').html(postL10n.showcomm);
                         return;
                     } else if ( 1 == r ) {

trunk/wp-includes/script-loader.php

@@ -176 +176 @@
             'cancel' => __('Cancel'),
         ) );
-        $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20080925' );
+        $scripts->add( 'post', '/wp-admin/js/post.js', array('suggest', 'jquery-ui-tabs', 'wp-lists', 'postbox', 'slug', 'settings-box'), '20081018' );
         $scripts->localize( 'post', 'postL10n', array(
             'tagsUsed' =>  __('Tags used on this post:'),