diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-30 06:30:46 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-30 06:30:46 -0400 |
| commit | f17f51a9c1f62dc0229e2428cacea4e84313560e (patch) | |
| tree | 7486b05738e943bf39619d06bec9d83d7795e746 /view/js/main.js | |
| parent | 5a63ddd6457ae4dba61ff30db5b6601b22ddd1b6 (diff) | |
| parent | d858bd9265a4a0fa3589cdb2126031998310c7c3 (diff) | |
| download | volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.gz volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.tar.bz2 volse-hubzilla-f17f51a9c1f62dc0229e2428cacea4e84313560e.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'view/js/main.js')
| -rw-r--r-- | view/js/main.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js index a288f98f5..a3fade0ea 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -659,7 +659,7 @@ function collapseHeight() { var position = $(window).scrollTop(); $(".wall-item-content, .directory-collapse").each(function() { - var orgHeight = parseInt($(this).css('height')); + var orgHeight = $(this).outerHeight(true); if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { @@ -679,7 +679,7 @@ function collapseHeight() { beforeToggle: function(trigger, element, expanded) { if(expanded) { if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { - $(window).scrollTop($(window).scrollTop() - (orgHeight - divmore_height)); + $(window).scrollTop($(window).scrollTop() - ($(element).outerHeight(true) - divmore_height)); } } } |