Merge https://github.com/redmatrix/hubzilla into pending_merge

1 files changed, 10 insertions, 7 deletions

diff --git a/view/js/main.js b/view/js/main.js
index ca2f3bbcb..04b317914 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -618,7 +618,7 @@ function updateConvItems(mode,data) {
 	/* autocomplete @nicknames */
 	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 
-	var bimgs = $(".wall-item-body img").not(function() { return this.complete; });
+	var bimgs = ((preloadImages) ? false : $(".wall-item-body img").not(function() { return this.complete; }));
 	var bimgcount = bimgs.length;
 
 	if (bimgcount) {
@@ -632,8 +632,6 @@ function updateConvItems(mode,data) {
 		collapseHeight();
 	}
 
-	//collapseHeight();
-
 }
 
 function collapseHeight() {
@@ -648,9 +646,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++;
@@ -739,8 +740,7 @@ function liveUpdate() {
 		var dready = new Date();
 		console.log('DATA ready in: ' + (dready - dstart)/1000 + ' seconds.');
 
-
-		if(update_mode === 'update') {
+		if(update_mode === 'update' || preloadImages) {
 			console.log('LOADING images...');
 
 			$('.wall-item-body, .wall-photo-item',data).imagesLoaded( function() {
@@ -753,7 +753,10 @@ 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
+				if(update_mode === 'update') {
+					$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight + contentHeightDiff);
+				}
 
 				in_progress = false;