From 364972a2925ee9545364e53b79d5a3d50149119d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 16 Feb 2016 21:29:09 +0100
Subject: Thats probably better but there are still edge cases...

---
 view/js/main.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/js/main.js')

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;
 
-- 
cgit v1.2.3