Ticket #2587: activity.diff

bp-activity/bp-activity-templatetags.php

@@ -650 +650 @@
                         if ( !$comment->children )
                                 return false;
 
-                        $content .= '<ul>';
+                        $content .= '<ul class="acomment-container">';
                         foreach ( (array)$comment->children as $comment ) {
                                 if ( !$comment->user_fullname )
                                         $comment->user_fullname = $comment->display_name;

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

@@ -1021 +1021 @@
 /* > Activity Stream Listing
 -------------------------------------------------------------- */
 
+div.show-hidden a {
+        position: absolute;
+        right: 0;
+        top: 7px;
+        background-color: #eee;
+        text-decoration: none;
+        padding: 3px 6px;
+        font-size: 11px;
+        color: #999;
+        text-decoration: none;
+        -moz-border-radius: 6px;
+        -webkit-border-radius: 6px;
+        border-radius: 6px;
+}
+div.show-hidden a:active,
+div.show-hidden a:hover {
+        color: #666;
+}
+div.show-hidden.loading a {
+        background-image: url( ../images/ajax-loader.gif );
+        background-position: 2% 50%;
+        background-repeat: no-repeat;
+        padding-left: 20px;
+}
+
 ul.activity-list li {
         padding: 20px 0 0 0;
         overflow: hidden;

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

@@ -430 +430 @@
 
                         return false;
                 }
+
+                /* Showing hidden comments - pause for half a second */
+                if ( target.parent().hasClass('show-hidden') ) {
+                        target.parent().addClass('loading');
+
+                        setTimeout( function() {
+                                target.parent().parent().parent().find('ul.acomment-container li').fadeIn(600, function() {
+                                        target.parent().parent().find('.show-hidden').fadeOut( 200 );
+                                });
+                                jq.scrollTo( target.parent().parent().parent(), 1000, { offset: -40, easing: 'easeout' } );
+                        }, 1000 );
+
+                        return false;
+                }
         });
 
         /* Escape Key Press for cancelling comment forms */
@@ -1180 +1194 @@
         }, 'json' );
 }
 
-/* Hide long lists of activity comments, only show the latest five root comments. */
 function bp_dtheme_hide_comments() {
+
+        // Set thresholds for when 'More' clickables will appear'
+        var large_threshold = 5;
+        var small_threshold = 1;
+
+        // Check for activity comments
+        var comments_divs   = jq('div.activity-comments');
+
+        // Loop through each div.activity-comments
+        comments_divs.each( function(i) {
+
+                // The top-most parent activity div in a hierarchy
+                var comments_div          = jq(this);
+                
+                // Total number of replies to this activity item
+                var comment_replies_total = comments_div.find('ul.acomment-container li').size();
+
+                // Recursive replies within the current top-most activity item
+                var comment_replies       = comments_div.children('ul.acomment-container').children('li');
+
+                // If the total number of replies is greater than the large threshold, start the hiding process
+                if ( comment_replies_total > large_threshold ) {
+
+                        // Loop through each top level reply and possibly hide the children
+                        comment_replies.each( function() {
+                                var this_reply = jq(this);
+
+                                // Get the replies objects and the count of them
+                                var comment_nested_replies       = this_reply.children('ul.acomment-container').children('li');
+                                var comment_nested_replies_count = this_reply.find('ul.acomment-container li').size();
+
+                                // There are enough immediate replies to hide some
+                                if ( comment_nested_replies_count > small_threshold ) {
+
+                                        // Inject a 'Show X replies' link in the top level reply
+                                        comment_nested_replies.before( '<div class="show-hidden"><a href="/show-all/#' + comment_replies.attr( 'id' ) + '" title="' + BP_DTheme.show_all_comments + '">' + BP_DTheme.show_all + ' ' + comment_nested_replies_count + ' ' + BP_DTheme.comments + '</a></div>' );
+
+                                        // Loop through nested replies and hide them
+                                        comment_nested_replies.each( function() {
+                                                var nested_reply = jq(this);
+
+                                                nested_reply.addClass('hidden');
+                                                nested_reply.toggle();
+                                        });
+                                }
+                        });
+                }
+        });
+}
+
+/* Hide long lists of activity comments, only show the latest five root comments. */
+function bp_dtheme_hide_comments_old() {
         var comments_divs = jq('div.activity-comments');
 
         if ( !comments_divs.length )
@@ -1205 +1270 @@
                                 jq(this).toggle();
 
                                 if ( !i )
-                                        jq(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + BP_DTheme.show_all_comments + '">' + BP_DTheme.show_all + ' ' + comment_count + ' ' + BP_DTheme.comments + '</a></li>' );
+                                        jq(this).before( '<li class="show-hidden"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + BP_DTheme.show_all_comments + '">' + BP_DTheme.show_all + ' ' + comment_count + ' ' + BP_DTheme.comments + '</a></li>' );
                         }
                 });
 

bp-themes/bp-default/functions.php

@@ -27 +27 @@
         'accepted'          => __( 'Accepted', 'buddypress' ),
         'rejected'          => __( 'Rejected', 'buddypress' ),
         'show_all_comments' => __( 'Show all comments for this thread', 'buddypress' ),
-        'show_all'          => __( 'Show all', 'buddypress' ),
-        'comments'          => __( 'comments', 'buddypress' ),
+        'show_all'          => __( 'Show', 'buddypress' ),
+        'comments'          => __( 'replies', 'buddypress' ),
         'close'             => __( 'Close', 'buddypress' ),
         'mention_explain'   => sprintf( __( "%s is a unique identifier for %s that you can type into any message on this site. %s will be sent a notification and a link to your message any time you use it.", 'buddypress' ), '@' . bp_get_displayed_user_username(), bp_get_user_firstname( bp_get_displayed_user_fullname() ), bp_get_user_firstname( bp_get_displayed_user_fullname() ) )
 );