diff options
| author | zottel <github@zottel.net> | 2016-07-22 20:16:49 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-07-22 20:16:49 +0200 |
| commit | ed82cb108f99ce45ced841161fa505ecf11ceee4 (patch) | |
| tree | 03d75b325963a2ba5eba83045c1d1a042c4862f2 /view/js | |
| parent | 43def0873e6cc4cf535eb8282187757dd84283c2 (diff) | |
| parent | 4ffc4ee70aa38c24cee2a7ae0b35c9203515acef (diff) | |
| download | volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.tar.gz volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.tar.bz2 volse-hubzilla-ed82cb108f99ce45ced841161fa505ecf11ceee4.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'view/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)); } } } |