aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-18 22:46:21 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-18 22:46:21 -0700
commit74827133b29138b9209131a0ec192cd00aff4b19 (patch)
treefae66745f0614cb913d2d85d117722987137a6d6 /view/js
parent43251ed8ce8a59472686321b8faa2b352928d239 (diff)
parent7c8706757db1df0195edc64f35ca1554d04eb414 (diff)
downloadvolse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.tar.gz
volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.tar.bz2
volse-hubzilla-74827133b29138b9209131a0ec192cd00aff4b19.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: util/messages.po
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 77184465d..d3c7175d0 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -615,7 +615,7 @@ function updateConvItems(mode,data) {
function collapseHeight() {
- $(".wall-item-body, .directory-collapse").each(function() {
+ $(".wall-item-content, .directory-collapse").each(function() {
var orgHeight = $(this).height();
if(orgHeight > divmore_height + 10) {
if(! $(this).hasClass('divmore')) {