Changeset 2266

Timestamp:

01/06/2010 12:07:27 PM (15 years ago)

Author:

apeatling

Message:

Limiting the maximum number of comments that can show for an activity thread. I18n still to be fixed up in JS.

Location:

trunk/bp-themes/bp-default

Files:

• _inc/css/default.css (modified) (1 diff)
• _inc/global.js (modified) (6 diffs)
• activity/entry.php (modified) (1 diff)

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -481 +481 @@
             -webkit-border-top-right-radius: 3px;
         }
-            div.item-list-tabs ul li.loading a {
+            ul li.loading a {
                 background-image: url( ../images/ajax-loader.gif );
                 background-position: 92% 50%;

trunk/bp-themes/bp-default/_inc/global.js

@@ -107 +107 @@
     });
 
+    /* Activity filter select */
     j('#activity-filter-select select').change( function() {
         var selected_tab = j( '.' + j(this).parent().parent().parent().attr('class') + ' li.selected');
@@ -247 +248 @@
             j('div.item-list-tabs li.selected, div.item-list-tabs li.current').removeClass('loading');
 
+            /* Selectively hide comments */
+            bp_dtheme_hide_comments();
+
         }, 'json' );
     }
@@ -254 +258 @@
     /* Hide all activity comment forms */
     j('form.ac-form').hide();
+
+    /* Hide excess comments */
+    if ( j('div.activity-comments').length )
+        bp_dtheme_hide_comments();
 
     /* Activity list event delegation */
@@ -346 +354 @@
                     );
                     j( 'form#' + form + ' textarea').val('');
+
+                    /* Increase the "Reply (X)" button count */
+                    j('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( j('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
 
                     /* Re-enable the submit button after 5 seconds. */
@@ -389 +400 @@
                             comment_li.parent().append( children.html() ).hide().fadeIn( 200 );
                     });
+
+                    /* Decrease the "Reply (X)" button count */
+                    var parent_li = comment_li.parents('ul#activity-stream > li');
+                    j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html( j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html() - 1 );
                 }
             });
+
+            return false;
+        }
+
+        /* Showing hidden comments - pause for half a second */
+        if ( target.parent().hasClass('show-all') ) {
+            target.parent().addClass('loading');
+
+            setTimeout( function() {
+                target.parent().parent().children('li').fadeIn(200, function() {
+                    target.parent().remove();
+                });
+            }, 600 );
 
             return false;
@@ -419 +447 @@
         }
     });
+
+    function bp_dtheme_hide_comments() {
+        var comments_divs = j('div.activity-comments');
+
+        if ( !comments_divs.length )
+            return false;
+
+        comments_divs.each( function() {
+            if ( j(this).children('ul').children('li').length < 5 ) return;
+
+            var comments_div = j(this);
+            var parent_li = comments_div.parents('ul#activity-stream > li');
+            var comment_lis = j(this).children('ul').children('li');
+
+            comment_lis.each( function(i) {
+                /* Show the latest 5 root comments */
+                if ( i < comment_lis.length - 5 ) {
+                    j(this).addClass('hidden');
+                    j(this).toggle();
+
+                    if ( !i )
+                        j(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="Show all comments for this thread">Show all ' +  j('li#' + parent_li.attr('id') + ' a.acomment-reply span').html() + ' comments</a></li>' );
+                }
+            });
+
+        });
+    }
 
     /**** Directory Search ****************************************************/

trunk/bp-themes/bp-default/activity/entry.php

@@ -11 +11 @@
         <div class="activity-meta">
             <?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?>
-                <a href="#acomment-<?php bp_activity_id() ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Reply', 'buddypress' ) ?> (<?php bp_activity_comment_count() ?>)</a>
+                <a href="#acomment-<?php bp_activity_id() ?>" class="acomment-reply" id="acomment-comment-<?php bp_activity_id() ?>"><?php _e( 'Reply', 'buddypress' ) ?> (<span><?php bp_activity_comment_count() ?></span>)</a>
             <?php endif; ?>