diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-09 06:03:43 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-09 06:03:43 +0100 |
| commit | 8c99228c8ab4d0475dc2065e5682dd22d680d4e7 (patch) | |
| tree | 65d2d57bde451526dc1dc3567d4c8722c7df807b /view/js/main.js | |
| parent | 2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (diff) | |
| parent | f984502499c836cde0be647907be505508c04e0c (diff) | |
| download | volse-hubzilla-8c99228c8ab4d0475dc2065e5682dd22d680d4e7.tar.gz volse-hubzilla-8c99228c8ab4d0475dc2065e5682dd22d680d4e7.tar.bz2 volse-hubzilla-8c99228c8ab4d0475dc2065e5682dd22d680d4e7.zip | |
Merge remote-tracking branch 'upstream/master'
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 2b13acc3d..d1bf34699 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -641,7 +641,7 @@ function collapseHeight() { if(orgHeight > divmore_height) { if(! $(this).hasClass('divmore')) { - var trigger = $(window).scrollTop() + ($(window).height() - divmore_height) < $(this).offset().top ? true : false; + var trigger = $(window).scrollTop() < $(this).offset().top ? true : false; if(trigger) { $(this).readmore({ @@ -653,7 +653,7 @@ function collapseHeight() { beforeToggle: function(trigger, element, expanded) { if(expanded) { if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) { - $('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 0 } ); + $(window).scrollTop($(window).scrollTop() - (orgHeight - divmore_height)); } } } |