<!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][7002] trunk: Update 'Show all x comments' count after creating or deleting 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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><a href="http://buddypress.trac.wordpress.org/changeset/7002">7002</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-06 00:49:35 +0000 (Mon, 06 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update 'Show all x comments' count after creating or deleting activity comments
On activity permalink pages, the comment list is collapsed if the item has more
than 6 responses, and a link is appended that reads 'Show all x comments'. This
changeset introduces additional JavaScript to update this count when a new
activity comment is created, or an existing one is deleted, via AJAX.
In the process of making the change, the logic for constructing the 'Show all
x comments' string was changed, so that it's now properly translatable.
Also cached a JS variable that was being used many times, to avoid unnecessary
DOM traversal.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4844">#4844</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbptemplatesbplegacybuddypressfunctionsphp">trunk/bp-templates/bp-legacy/buddypress-functions.php</a></li>
<li><a href="#trunkbptemplatesbplegacyjsbuddypressjs">trunk/bp-templates/bp-legacy/js/buddypress.js</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress-functions.php (7001 => 7002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-05-06 00:35:15 UTC (rev 7001)
+++ trunk/bp-templates/bp-legacy/buddypress-functions.php 2013-05-06 00:49:35 UTC (rev 7002)
</span><span class="lines">@@ -252,6 +252,7 @@
</span><span class="cx"> 'accepted' => __( 'Accepted', 'buddypress' ),
</span><span class="cx"> 'rejected' => __( 'Rejected', 'buddypress' ),
</span><span class="cx"> 'show_all_comments' => __( 'Show all comments for this thread', 'buddypress' ),
</span><ins>+ 'show_x_comments' => __( 'Show all %d comments', 'buddypress' ),
</ins><span class="cx"> 'show_all' => __( 'Show all', 'buddypress' ),
</span><span class="cx"> 'comments' => __( 'comments', 'buddypress' ),
</span><span class="cx"> 'close' => __( 'Close', 'buddypress' ),
</span></span></pre></div>
<a id="trunkbptemplatesbplegacyjsbuddypressjs"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/js/buddypress.js (7001 => 7002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/js/buddypress.js 2013-05-06 00:35:15 UTC (rev 7001)
+++ trunk/bp-templates/bp-legacy/js/buddypress.js 2013-05-06 00:49:35 UTC (rev 7002)
</span><span class="lines">@@ -443,26 +443,34 @@
</span><span class="cx"> if ( response[0] + response[1] == '-1' ) {
</span><span class="cx"> form.append( jq( response.substr( 2, response.length ) ).hide().fadeIn( 200 ) );
</span><span class="cx"> } else {
</span><ins>+ var activity_comments = form.parent();
</ins><span class="cx"> form.fadeOut( 200, function() {
</span><del>- if ( 0 == form.parent().children('ul').length ) {
- if ( form.parent().hasClass('activity-comments') ) {
- form.parent().prepend('<ul></ul>');
</del><ins>+ if ( 0 == activity_comments.children('ul').length ) {
+ if ( activity_comments.hasClass('activity-comments') ) {
+ activity_comments.prepend('<ul></ul>');
</ins><span class="cx"> } else {
</span><del>- form.parent().append('<ul></ul>');
</del><ins>+ activity_comments.append('<ul></ul>');
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Preceeding whitespace breaks output with jQuery 1.9.0 */
</span><span class="cx"> var the_comment = jq.trim( response );
</span><span class="cx">
</span><del>- form.parent().children('ul').append( jq( the_comment ).hide().fadeIn( 200 ) );
</del><ins>+ activity_comments.children('ul').append( jq( the_comment ).hide().fadeIn( 200 ) );
</ins><span class="cx"> form.children('textarea').val('');
</span><del>- form.parent().parent().addClass('has-comments');
</del><ins>+ activity_comments.parent().addClass('has-comments');
</ins><span class="cx"> } );
</span><span class="cx"> jq( '#' + form.attr('id') + ' textarea').val('');
</span><span class="cx">
</span><span class="cx"> /* Increase the "Reply (X)" button count */
</span><span class="cx"> jq('#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
</span><ins>+
+ // Increment the 'Show all x comments' string, if present
+ var show_all_a = activity_comments.find('.show-all').find('a');
+ if ( show_all_a ) {
+ var new_count = jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html();
+ show_all_a.html( BP_DTheme.show_x_comments.replace( '%d', new_count ) );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> jq(target).prop("disabled", false);
</span><span class="lines">@@ -518,6 +526,12 @@
</span><span class="cx"> var count_span = jq('#' + comment_li.parents('#activity-stream > li').attr('id') + ' a.acomment-reply span');
</span><span class="cx"> var new_count = count_span.html() - ( 1 + child_count );
</span><span class="cx"> count_span.html(new_count);
</span><ins>+
+ // Change the 'Show all x comments' text
+ var show_all_a = comment_li.siblings('.show-all').find('a');
+ if ( show_all_a ) {
+ show_all_a.html( BP_DTheme.show_x_comments.replace( '%d', new_count ) );
+ }
</ins><span class="cx">
</span><span class="cx"> /* If that was the last comment for the item, remove the has-comments class to clean up the styling */
</span><span class="cx"> if ( 0 == new_count ) {
</span><span class="lines">@@ -1406,8 +1420,8 @@
</span><span class="cx"> jq(this).addClass('hidden');
</span><span class="cx"> jq(this).toggle();
</span><span class="cx">
</span><del>- 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>' );
</del><ins>+ 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_x_comments.replace( '%d', comment_count ) + '</a></li>' );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (7001 => 7002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2013-05-06 00:35:15 UTC (rev 7001)
+++ trunk/bp-themes/bp-default/_inc/global.js 2013-05-06 00:49:35 UTC (rev 7002)
</span><span class="lines">@@ -436,27 +436,35 @@
</span><span class="cx"> if ( response[0] + response[1] == '-1' ) {
</span><span class="cx"> form.append( jq( response.substr( 2, response.length ) ).hide().fadeIn( 200 ) );
</span><span class="cx"> } else {
</span><ins>+ var activity_comments = form.parent();
</ins><span class="cx"> form.fadeOut( 200, function() {
</span><del>- if ( 0 == form.parent().children('ul').length ) {
- if ( form.parent().hasClass('activity-comments') ) {
- form.parent().prepend('<ul></ul>');
</del><ins>+ if ( 0 == activity_comments.children('ul').length ) {
+ if ( activity_comments.hasClass('activity-comments') ) {
+ activity_comments.prepend('<ul></ul>');
</ins><span class="cx"> } else {
</span><del>- form.parent().append('<ul></ul>');
</del><ins>+ activity_comments.append('<ul></ul>');
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Preceeding whitespace breaks output with jQuery 1.9.0 */
</span><span class="cx"> var the_comment = jq.trim( response );
</span><span class="cx">
</span><del>- form.parent().children('ul').append( jq( the_comment ).hide().fadeIn( 200 ) );
</del><ins>+ activity_comments.children('ul').append( jq( the_comment ).hide().fadeIn( 200 ) );
</ins><span class="cx"> form.children('textarea').val('');
</span><del>- form.parent().parent().addClass('has-comments');
</del><ins>+ activity_comments.parent().addClass('has-comments');
</ins><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> jq( 'form#' + form.attr('id') + ' textarea').val('');
</span><span class="cx">
</span><span class="cx"> /* Increase the "Reply (X)" button count */
</span><span class="cx"> jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
</span><ins>+
+ // Increment the 'Show all x comments' string, if present
+ var show_all_a = activity_comments.find('.show-all').find('a');
+ if ( show_all_a ) {
+ var new_count = jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html();
+ show_all_a.html( BP_DTheme.show_x_comments.replace( '%d', new_count ) );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> jq(target).prop("disabled", false);
</span><span class="lines">@@ -512,6 +520,12 @@
</span><span class="cx"> var count_span = jq('li#' + comment_li.parents('ul#activity-stream > li').attr('id') + ' a.acomment-reply span');
</span><span class="cx"> var new_count = count_span.html() - ( 1 + child_count );
</span><span class="cx"> count_span.html(new_count);
</span><ins>+
+ // Change the 'Show all x comments' text
+ var show_all_a = comment_li.siblings('.show-all').find('a');
+ if ( show_all_a ) {
+ show_all_a.html( BP_DTheme.show_x_comments.replace( '%d', new_count ) );
+ }
</ins><span class="cx">
</span><span class="cx"> /* If that was the last comment for the item, remove the has-comments class to clean up the styling */
</span><span class="cx"> if ( 0 == new_count ) {
</span><span class="lines">@@ -1390,7 +1404,7 @@
</span><span class="cx"> jq(this).toggle();
</span><span class="cx">
</span><span class="cx"> if ( !i )
</span><del>- 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>' );
</del><ins>+ jq(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + BP_DTheme.show_all_comments + '">' + BP_DTheme.show_x_comments.replace( '%d', comment_count ) + '</a></li>' );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (7001 => 7002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2013-05-06 00:35:15 UTC (rev 7001)
+++ trunk/bp-themes/bp-default/functions.php 2013-05-06 00:49:35 UTC (rev 7002)
</span><span class="lines">@@ -159,6 +159,7 @@
</span><span class="cx"> 'accepted' => __( 'Accepted', 'buddypress' ),
</span><span class="cx"> 'rejected' => __( 'Rejected', 'buddypress' ),
</span><span class="cx"> 'show_all_comments' => __( 'Show all comments for this thread', 'buddypress' ),
</span><ins>+ 'show_x_comments' => __( 'Show all %d comments', 'buddypress' ),
</ins><span class="cx"> 'show_all' => __( 'Show all', 'buddypress' ),
</span><span class="cx"> 'comments' => __( 'comments', 'buddypress' ),
</span><span class="cx"> 'close' => __( 'Close', 'buddypress' ),
</span></span></pre>
</div>
</div>
</body>
</html>