aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-05-16 17:57:29 -0700
committerFriendika <info@friendika.com>2011-05-16 17:57:29 -0700
commit85c6457e6e6c9be6200f76bb12c449f010d4117b (patch)
treea850c24730e96d4eb0cb11ecd5ba3fee7a11b4be
parent31d53c5b2a2d0832878cd813eee55023c52d5b36 (diff)
downloadvolse-hubzilla-85c6457e6e6c9be6200f76bb12c449f010d4117b.tar.gz
volse-hubzilla-85c6457e6e6c9be6200f76bb12c449f010d4117b.tar.bz2
volse-hubzilla-85c6457e6e6c9be6200f76bb12c449f010d4117b.zip
bug #65 'show all nn comments', 'show more posts like this' are misleading after they've been clicked once. Solution, hide them once clicked.
-rw-r--r--boot.php2
-rw-r--r--include/conversation.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index e06e1574e..a44d8298f 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.2.981' );
+define ( 'FRIENDIKA_VERSION', '2.2.982' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1054 );
diff --git a/include/conversation.php b/include/conversation.php
index a58a4d638..febd6c347 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -267,7 +267,7 @@ function conversation(&$a, $items, $mode, $update) {
$blowhard_count ++;
if($blowhard_count == 3) {
$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent']
- . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >'
+ . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\'); $(\'#icollapse-wrapper-' . $item['parent'] . '\').hide();" >'
. t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-'
. $item['parent'] . '" style="display: none;" >';
}
@@ -292,7 +292,7 @@ function conversation(&$a, $items, $mode, $update) {
if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
if(! $comments_collapsed) {
$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent']
- . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >'
+ . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\'); $(\'#ccollapse-wrapper-' . $item['parent'] . '\').hide();" >'
. sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>'
. '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
$comments_collapsed = true;