diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2017-04-19 17:21:15 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2017-04-20 07:03:54 +0200 |
| commit | 4abde895a5b579fb798e062806c8fef2289f0d8f (patch) | |
| tree | 6898017bad6285e6a2c9c76c89dc39506f357570 | |
| parent | 44858e06188946c0082bb09061fcfa6cbb33938b (diff) | |
| download | aur-4abde895a5b579fb798e062806c8fef2289f0d8f.tar.gz aur-4abde895a5b579fb798e062806c8fef2289f0d8f.tar.xz | |
Use JavaScript to collapse long comments
Instead of using CSS to limit the height of package comments as
implemented in 7b13203 (Limit comment height to 15 lines, 2016-03-12),
use JavaScript to collapse long comments and add a link to expand them.
Clicking the same link twice results in the corresponding comment being
collapsed again.
If JavaScript is disabled, the full comments are shown (without any
possibility to collapse or expand).
Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
| -rw-r--r-- | web/html/css/aurweb.css | 5 | ||||
| -rw-r--r-- | web/html/packages.php | 35 | ||||
| -rw-r--r-- | web/template/pkg_comments.php | 2 |
3 files changed, 36 insertions, 6 deletions
diff --git a/web/html/css/aurweb.css b/web/html/css/aurweb.css index f777ab83..f5e10371 100644 --- a/web/html/css/aurweb.css +++ b/web/html/css/aurweb.css @@ -148,8 +148,3 @@ label.confirmation, color: red; font-weight: bold; } - -#news div p { - max-height: 15em; - overflow: auto; -} diff --git a/web/html/packages.php b/web/html/packages.php index 113a1145..8d76c76d 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -72,10 +72,45 @@ function collapseDependsList(list) { }); } +function collapseComment(div) { + var linkid = div.attr('id') + 'link', + par = div.find('p'), + height = par.height(), + maxheight = 200; + + if (height <= maxheight) + return; + + par.css({ 'overflow': 'hidden', 'height': maxheight + 'px' }); + par.addClass('collapsed'); + par.after('<p><a id="' + linkid + '" href="#">Show More…</a></p>'); + + $('#' + linkid).click(function(event) { + var newheight; + + if (par.hasClass('collapsed')) { + par.css({ 'height': 'auto' }); + newheight = par.height(); + par.css({ 'height': maxheight }); + $(this).text('Collapse'); + } else { + newheight = maxheight; + $(this).text('Show More…'); + } + + par.animate({ 'height': newheight }); + par.toggleClass('collapsed'); + event.preventDefault(); + }); +} + $(document).ready(function() { collapseDependsList("#pkgdepslist"); collapseDependsList("#pkgreqslist"); collapseDependsList("#pkgsrcslist"); + $(".article-content").each(function() { + collapseComment($(this)); + }); }); </script> diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index fee1898c..c23ec421 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -102,7 +102,7 @@ if (!isset($count)) { </form> <?php endif; ?> </h4> - <div class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>"> + <div id="<?= isset($pinned) ? "pinned-" : "comment-" ?><?= $row['ID'] ?>-content" class="article-content<?php if ($is_deleted): ?> comment-deleted<?php endif; ?>"> <p> <?= parse_comment($row['Comments']) ?> </p> |