diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-09 14:17:14 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-09 14:17:14 -0800 |
| commit | 15d422db80234d220f0ead0b5554f82f50e571e7 (patch) | |
| tree | fff7e2fb2d4a4bd05f9e91e7a7328b71e6d3e755 /view/js/main.js | |
| parent | b6477cd38b532ebe69a480460e7b883964ec6627 (diff) | |
| parent | 15ab331b6b5793d04979e204af92084e8d5bb03c (diff) | |
| download | volse-hubzilla-15d422db80234d220f0ead0b5554f82f50e571e7.tar.gz volse-hubzilla-15d422db80234d220f0ead0b5554f82f50e571e7.tar.bz2 volse-hubzilla-15d422db80234d220f0ead0b5554f82f50e571e7.zip | |
Merge branch 'dspr' into red
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/main.js b/view/js/main.js index 5de4aa9a2..db7ad110b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -695,7 +695,7 @@ function collapseHeight() { $(".wall-item-content, .directory-collapse").each(function() { var orgHeight = $(this).outerHeight(true); if(orgHeight > divmore_height) { - if(! $(this).hasClass('divmore')) { + if(! $(this).hasClass('divmore') && $(this).has('div.no-collapse').length == 0) { // check if we will collapse some content above the visible content and compensate the diff later if($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i) < 65) { |