diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-31 10:38:19 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-31 10:38:19 +0100 |
| commit | 0cd82ec680e6a5a352781861a63685038fea723a (patch) | |
| tree | 9e504d9f30db8ca2b36c6d2cf0ff4cfdb9ee094f /view/js | |
| parent | 76484f154124ccade9efd3a6b704692112a97477 (diff) | |
| parent | 1f87fef9684a29da91fcb41a5d1d3bd4fb9a4619 (diff) | |
| download | volse-hubzilla-0cd82ec680e6a5a352781861a63685038fea723a.tar.gz volse-hubzilla-0cd82ec680e6a5a352781861a63685038fea723a.tar.bz2 volse-hubzilla-0cd82ec680e6a5a352781861a63685038fea723a.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/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 16f6b9213..220898efd 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -637,7 +637,7 @@ function updateConvItems(mode,data) { function collapseHeight() { var origContentHeight = parseInt($("#region_2").height()); $(".wall-item-content, .directory-collapse").each(function() { - var orgHeight = parseInt($(this).height()); + var orgHeight = parseInt($(this).css('height')); if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { if($(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top) { |