diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/conversation.css | 2 | ||||
| -rw-r--r-- | view/js/main.js | 19 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 1 |
3 files changed, 15 insertions, 7 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css index 3d206797f..38970bb45 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -244,7 +244,7 @@ a.wall-item-name-link { top: 0; left: 0; border-color: var(--hz-item-indent, var(--bs-border-color)); - border-radius: 0 var(--bs-border-radius) 0 0; + border-radius: 0 1.5rem 0 0; border-style: solid; border-width: 1px 1px 0 0; } diff --git a/view/js/main.js b/view/js/main.js index b1cae8fb8..5bf7234aa 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -894,15 +894,22 @@ 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.classList.contains('wall-item-sub-thread-wrapper') && 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'); } + + let elemSubThreadWrapper = elem.querySelector('.wall-item-sub-thread-wrapper'); + let elemCommentButton = elem.querySelector('.wall-item-comment'); + + // Set the button and sub-thread-wrapper state + if (elemCommentButton && elemSubThreadWrapper.children.length) { + elemCommentButton.classList.add('expanded'); + } + + elem.parentNode.classList.add('item-expanded'); } b64mids.push(...data_json); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 113660c7e..be66c00d4 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -88,6 +88,7 @@ } else { if (!document.hidden) { + sse_fallback(); sse_fallback_interval = setInterval(sse_fallback, updateInterval); } |