Changeset 4239

Timestamp:

04/22/2011 08:30:22 PM (13 years ago)

Author:

boonebgorges

Message:

Adds Read More functionality to activity comments. Adds AJAX functionality to activity Read More. Fixes #2635. Fixes bugs with the way that activity comment content and meta links are displayed. Fixes #3168.

Location:

trunk

Files:

• bp-activity/bp-activity-filters.php (modified) (2 diffs)
• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (1 diff)
• bp-themes/bp-default/_inc/global.js (modified) (1 diff)

trunk/bp-activity/bp-activity-filters.php

@@ -157 +157 @@
  */
 function bp_activity_truncate_entry( $text ) {
+    global $activities_template;
+    
     // The full text of the activity update should always show on the single activity screen
     if ( bp_is_single_activity() )
@@ -164 +166 @@
     $excerpt_length = apply_filters( 'bp_activity_excerpt_length', 358 );
     $excerpt        = $text;
-
+    
+    $id     = !empty( $activities_template->activity->current_comment->id ) ? 'acomment-read-more-' . $activities_template->activity->current_comment->id : 'activity-read-more-' . bp_get_activity_id();
+    
     if ( strlen( $excerpt ) > $excerpt_length )
-        $excerpt = sprintf( '%1$s<span class="activity-read-more"><a href="%2$s" rel="nofollow">%3$s</a></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '&hellip;' ), bp_get_activity_thread_permalink(), $append_text );
+        $excerpt = sprintf( '%1$s<span class="activity-read-more" id="%2$s"><a href="%3$s" rel="nofollow">%4$s</a></span>', bp_create_excerpt( $excerpt, $excerpt_length, true, '&hellip;' ), $id, bp_get_activity_thread_permalink(), $append_text );
     
     return apply_filters( 'bp_activity_truncate_entry', $excerpt, $text, $append_text );
 }
 add_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
+add_filter( 'bp_get_activity_content', 'bp_activity_truncate_entry', 5 );
 ?>

trunk/bp-activity/bp-activity-template.php

@@ -800 +800 @@
             $content = '<ul>';
             foreach ( (array)$comment->children as $comment_child ) {
+                // Put the comment into the global so it's available to filters
+                $activities_template->activity->current_comment = $comment_child;
+                
                 if ( empty( $comment_child->user_fullname ) )
                     $comment_child->user_fullname = $comment_child->display_name;
@@ -837 +840 @@
                 // hidden when JS is off.
                 if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment ) )
-                    $content .= apply_filters( 'bp_activity_comment_reply_link', '<span class="acomment-replylink"> &middot; <a href="#acomment-' . $comment->id . '" class="acomment-reply" id="acomment-reply-' . $activities_template->activity->id . '">' . __( 'Reply', 'buddypress' ) . '</a></span>', $comment );
+                    $content .= apply_filters( 'bp_activity_comment_reply_link', '<span class="acomment-replylink"> &middot; <a href="#acomment-' . $comment_child->id . '" class="acomment-reply" id="acomment-reply-' . $comment->id . '">' . __( 'Reply', 'buddypress' ) . '</a></span>', $comment_child );
 
                 // Delete link
                 if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id ) {
-                    $delete_url = wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' );
-                    $content .= apply_filters( 'bp_activity_comment_delete_link', ' &middot; <a href="' . $delete_url . '" class="delete acomment-delete" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>', $comment, $delete_url );
+                    $delete_url = wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/?cid=' . $comment_child->id, 'bp_activity_delete_link' );
+                    $content .= apply_filters( 'bp_activity_comment_delete_link', ' &middot; <a href="' . $delete_url . '" class="delete acomment-delete" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>', $comment_child, $delete_url );
                 }
 
                 $content .= '</div>';
-                $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment->content ) . '</div>';
+                $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment_child->content ) . '</div>';
 
                 $content .= bp_activity_recurse_comments( $comment_child );
                 $content .= '</li>';
+                
+                // Unset in the global in case of the last iteration
+                unset( $activities_template->activity->current_comment );
             }
             $content .= '</ul>';

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -320 +320 @@
 add_action( 'wp_ajax_activity_mark_unfav', 'bp_dtheme_unmark_activity_favorite' );
 
+/**
+ * AJAX handler for Read More link on long activity items
+ *
+ * @package BuddyPress
+ * @since 1.3
+ */
+function bp_dtheme_get_single_activity_content() {
+    $activity_array = bp_activity_get_specific( array( 
+        'activity_ids'      => $_POST['activity_id'], 
+        'display_comments'  => 'stream' 
+    ) );
+    
+    $activity = !empty( $activity_array['activities'][0] ) ? $activity_array['activities'][0] : false;
+    
+    if ( !$activity )
+        exit(); // todo: error?
+    
+    // Activity content retrieved through AJAX should run through normal filters, but not be
+    // truncated
+    remove_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
+    $content = apply_filters( 'bp_get_activity_content_body', $activity->content );
+    
+    echo $content;
+    
+    exit();
+}
+add_action( 'wp_ajax_get_single_activity_content', 'bp_dtheme_get_single_activity_content' );
+
 /* AJAX invite a friend to a group functionality */
 function bp_dtheme_ajax_invite_user() {

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

@@ -265 +265 @@
             return false;
         }
+    });
+
+    /* Activity "Read More" links */
+    jq('.activity-read-more a').click(function(event) {
+        var target = jq(event.target);
+        var link_id = target.parent().attr('id').split('-');
+        var a_id = link_id[3];
+        var type = link_id[0]; /* activity or acomment */
+        
+        var inner_class = type == 'acomment' ? 'acomment-content' : 'activity-inner';
+        var a_inner = jq('li#' + type + '-' + a_id + ' .' + inner_class );
+        
+        jq.post( ajaxurl, {
+            action: 'get_single_activity_content',
+            'activity_id': a_id
+        },
+        function(response) {
+            jq(a_inner).slideUp(200,function(){
+                jq(a_inner).html(response);
+                jq(a_inner).slideDown(200);
+            });
+        });
+        
+        
+        return false;
     });