From b8c7b2f81df61e5068366cbdb0f18940ff5d4bf1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 17 Feb 2016 11:07:47 +0100
Subject: more refinement on collapsing

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

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index ca2f3bbcb..6bc7d9e91 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -648,9 +648,12 @@ function collapseHeight() {
 			if(! $(this).hasClass('divmore')) {
 
 				//var trigger = $(window).scrollTop() < $(this).offset().top ? true : false;
+				//console.log($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i));
 
 				// check if we will collapse some content above the visible content and compensate the diff later
-				if(($(this).offset().top + orgHeight - $(window).scrollTop()) < 50) {
+				if($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i) < 65) {
+					//$(this).css('color', 'red');
+					//console.log($(this).offset().top + divmore_height + ' / ' + $(window).scrollTop());
 					diff = orgHeight - divmore_height;
 					cDiff = cDiff + diff;
 					i++;
@@ -753,7 +756,8 @@ function liveUpdate() {
 				$("#page-spinner").spin(false);
 				$("#profile-jot-text-loading").spin(false);
 
-				//$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
+				// adjust scroll position if new content was added above viewport
+				$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
 
 				in_progress = false;
 
-- 
cgit v1.2.3