From 06aa32db224926227794fe4e76bcdfdb1b6b62e5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 23 Feb 2019 21:48:45 +0100
Subject: fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20
 where selecting multiple images from embed photos dialog broke and fix issue
 where items were not scrolled to there correct position if
 justifiedGalleryActive flag was true

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

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

diff --git a/view/js/main.js b/view/js/main.js
index 4e4431f33..b1af29846 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -784,16 +784,26 @@ function updateConvItems(mode,data) {
 		collapseHeight();
 	}
 
+	if(bParam_mid && mode === 'replace')
+		scrollToItem();
+
+	$(document.body).trigger("sticky_kit:recalc");
+}
+
+function scrollToItem() {
 	// auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode
 	// use the same method to generate the submid as we use in ThreadItem, 
 	// base64_encode + replace(['+','='],['','']);
 
+	if(justifiedGalleryActive)
+		return;
+
 	var submid = ((bParam_mid.length) ? bParam_mid : 'abcdefg');
 	var encoded = ((submid.substr(0,4) == 'b64.') ? true : false);
 	var submid_encoded = ((encoded) ? submid.substr(4) : window.btoa(submid));
 
 	submid_encoded = submid_encoded.replace(/[\+\=]/g,'');
-	if($('.item_' + submid_encoded).length && !$('.item_' + submid_encoded).hasClass('toplevel_item') && mode == 'replace') {
+	if($('.item_' + submid_encoded).length && !$('.item_' + submid_encoded).hasClass('toplevel_item')) {
 		if($('.collapsed-comments').length) {
 			var scrolltoid = $('.collapsed-comments').attr('id').substring(19);
 			$('#collapsed-comments-' + scrolltoid + ' .autotime').timeago();
@@ -801,11 +811,9 @@ function updateConvItems(mode,data) {
 			$('#hide-comments-' + scrolltoid).html(aStr.showfewer);
 			$('#hide-comments-total-' + scrolltoid).hide();
 		}
-		$('html, body').animate({ scrollTop: $('.item_' + submid_encoded).offset().top - $('nav').outerHeight() }, 'slow');
+		$('html, body').animate({ scrollTop: $('.item_' + submid_encoded).offset().top - $('nav').outerHeight(true) }, 'slow');
 		$('.item_' + submid_encoded).addClass('item-highlight');
 	}
-
-	$(document.body).trigger("sticky_kit:recalc");
 }
 
 function collapseHeight() {
-- 
cgit v1.2.3