<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4239] trunk: Adds Read More functionality to activity comments.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4239</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-04-22 20:30:22 +0000 (Fri, 22 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (4238 => 4239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2011-04-22 17:30:27 UTC (rev 4238)
+++ trunk/bp-activity/bp-activity-filters.php 2011-04-22 20:30:22 UTC (rev 4239)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx"> * @return $excerpt The truncated text
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_truncate_entry( $text ) {
</span><ins>+ global $activities_template;
+
</ins><span class="cx"> // The full text of the activity update should always show on the single activity screen
</span><span class="cx"> if ( bp_is_single_activity() )
</span><span class="cx"> return $text;
</span><span class="lines">@@ -163,11 +165,14 @@
</span><span class="cx"> $append_text = apply_filters( 'bp_activity_excerpt_append_text', __( '[Read more]', 'buddypress' ) );
</span><span class="cx"> $excerpt_length = apply_filters( 'bp_activity_excerpt_length', 358 );
</span><span class="cx"> $excerpt = $text;
</span><del>-
</del><ins>+
+ $id = !empty( $activities_template->activity->current_comment->id ) ? 'acomment-read-more-' . $activities_template->activity->current_comment->id : 'activity-read-more-' . bp_get_activity_id();
+
</ins><span class="cx"> if ( strlen( $excerpt ) > $excerpt_length )
</span><del>- $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 );
</del><ins>+ $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 );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_activity_truncate_entry', $excerpt, $text, $append_text );
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bp_get_activity_content_body', 'bp_activity_truncate_entry', 5 );
</span><ins>+add_filter( 'bp_get_activity_content', 'bp_activity_truncate_entry', 5 );
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4238 => 4239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-04-22 17:30:27 UTC (rev 4238)
+++ trunk/bp-activity/bp-activity-template.php 2011-04-22 20:30:22 UTC (rev 4239)
</span><span class="lines">@@ -799,6 +799,9 @@
</span><span class="cx">
</span><span class="cx"> $content = '<ul>';
</span><span class="cx"> foreach ( (array)$comment->children as $comment_child ) {
</span><ins>+ // Put the comment into the global so it's available to filters
+ $activities_template->activity->current_comment = $comment_child;
+
</ins><span class="cx"> if ( empty( $comment_child->user_fullname ) )
</span><span class="cx"> $comment_child->user_fullname = $comment_child->display_name;
</span><span class="cx">
</span><span class="lines">@@ -836,19 +839,22 @@
</span><span class="cx"> // Reply link - the span is so that threaded reply links can be
</span><span class="cx"> // hidden when JS is off.
</span><span class="cx"> if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment ) )
</span><del>- $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 );
</del><ins>+ $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 );
</ins><span class="cx">
</span><span class="cx"> // Delete link
</span><span class="cx"> if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id ) {
</span><del>- $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 );
</del><ins>+ $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 );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $content .= '</div>';
</span><del>- $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment->content ) . '</div>';
</del><ins>+ $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment_child->content ) . '</div>';
</ins><span class="cx">
</span><span class="cx"> $content .= bp_activity_recurse_comments( $comment_child );
</span><span class="cx"> $content .= '</li>';
</span><ins>+
+ // Unset in the global in case of the last iteration
+ unset( $activities_template->activity->current_comment );
</ins><span class="cx"> }
</span><span class="cx"> $content .= '</ul>';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (4238 => 4239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2011-04-22 17:30:27 UTC (rev 4238)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2011-04-22 20:30:22 UTC (rev 4239)
</span><span class="lines">@@ -319,6 +319,34 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_ajax_activity_mark_unfav', 'bp_dtheme_unmark_activity_favorite' );
</span><span class="cx">
</span><ins>+/**
+ * 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' );
+
</ins><span class="cx"> /* AJAX invite a friend to a group functionality */
</span><span class="cx"> function bp_dtheme_ajax_invite_user() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (4238 => 4239)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2011-04-22 17:30:27 UTC (rev 4238)
+++ trunk/bp-themes/bp-default/_inc/global.js 2011-04-22 20:30:22 UTC (rev 4239)
</span><span class="lines">@@ -266,6 +266,31 @@
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ /* 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;
+ });
+
</ins><span class="cx"> /**** Activity Comments *******************************************************/
</span><span class="cx">
</span><span class="cx"> /* Hide all activity comment forms */
</span></span></pre>
</div>
</div>
</body>
</html>