aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-02-16 21:29:09 +0100
committerMario Vavti <mario@mariovavti.com>2016-02-16 21:29:09 +0100
commit364972a2925ee9545364e53b79d5a3d50149119d (patch)
tree72e6a5f0351ba072d8506f1941497bffee2d070d /view/js
parent0eb0256502f4091858f3773c92fd63b83eb9a5a9 (diff)
downloadvolse-hubzilla-364972a2925ee9545364e53b79d5a3d50149119d.tar.gz
volse-hubzilla-364972a2925ee9545364e53b79d5a3d50149119d.tar.bz2
volse-hubzilla-364972a2925ee9545364e53b79d5a3d50149119d.zip
Thats probably better but there are still edge cases...
Diffstat (limited to 'view/js')
-rw-r--r--view/js/main.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 2ae542ed8..ca2f3bbcb 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -650,7 +650,7 @@ function collapseHeight() {
//var trigger = $(window).scrollTop() < $(this).offset().top ? true : false;
// check if we will collapse some content above the visible content and compensate the diff later
- if($(window).scrollTop() > $(this).offset().top) {
+ if(($(this).offset().top + orgHeight - $(window).scrollTop()) < 50) {
diff = orgHeight - divmore_height;
cDiff = cDiff + diff;
i++;
@@ -753,7 +753,7 @@ function liveUpdate() {
$("#page-spinner").spin(false);
$("#profile-jot-text-loading").spin(false);
- $(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
+ //$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
in_progress = false;