properly set the comment button and sub-thread-wrapper state if we are loading a conversation in partly expanded mode

2 files changed, 8 insertions, 7 deletions

diff --git a/boot.php b/boot.php
index 04e56a95a..e44c21521 100644
--- a/boot.php
+++ b/boot.php
@@ -70,7 +70,7 @@ require_once('include/security.php');
 
 
 define('PLATFORM_NAME', 'hubzilla');
-define('STD_VERSION', '10.3.72');
+define('STD_VERSION', '10.3.73');
 define('ZOT_REVISION', '6.0');
 
 define('DB_UPDATE_VERSION', 1263);
diff --git a/view/js/main.js b/view/js/main.js
index b1cae8fb8..68528eefa 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -894,15 +894,16 @@ function updateConvItems(mode, data) {
 
 		let data_json = JSON.parse(elem.dataset.b64mids);
 
-		// Also highlight the thread parent
-		if (data_json.includes(bParam_mid) && elem.parentNode.classList.contains('wall-item-sub-thread-wrapper')) {
-			if (!elem.parentNode.parentNode.classList.contains('toplevel_item')) {
+		if (elem.parentNode.children.length) {
+			// Set the highlight state
+			if (data_json.includes(bParam_mid) && !elem.parentNode.parentNode.classList.contains('toplevel_item')) {
 				elem.parentNode.parentNode.classList.add('item-highlight');
 				document.documentElement.style.setProperty('--hz-item-highlight', stringToHslColor(JSON.parse(elem.parentNode.parentNode.dataset.b64mids)[0]));
-				// Mark the comment button at the parent expanded
-				// TODO: should do that for all comments that have replies expanded
-				elem.parentNode.parentNode.querySelector('.wall-item-comment').classList.add('expanded');
 			}
+
+			// Set the button and sub-thread-wrapper state
+			elem.parentNode.parentNode.querySelector('.wall-item-comment').classList.add('expanded');
+			elem.parentNode.classList.add('item-expanded');
 		}
 
 		b64mids.push(...data_json);