Merge branch 'js_fixes' into 'dev'

fix page jumping when liking a collapsed/expanded post

See merge request hubzilla/core!1484

1 files changed, 2 insertions, 2 deletions

diff --git a/view/js/main.js b/view/js/main.js
index ee11ab1c6..d88133b23 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -845,10 +845,10 @@ function collapseHeight() {
 	});
 
 	var collapsedContentHeight = Math.ceil($("#region_2").height());
-	contentHeightDiff = origContentHeight - collapsedContentHeight;
+	contentHeightDiff = liking ? 0 : origContentHeight - collapsedContentHeight;
 	console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px');
 
-	if(i){
+	if(i && !liking){
 		var sval = position - cDiff + ($(".divgrow-showmore").outerHeight() * i);
 		console.log('collapsed above viewport count: ' + i);
 		$(window).scrollTop(sval);