paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 14:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream_muting: Fix message reselect bug.

Browse Source 
Extended else if statement responsible for reselecting messages
to include check `!recent_topic_util.is_visible()`.

Before without this check, this code was consuming 1 unread
message on muting/unmuting a stream even when we were in
"Recent Conversations" view.
This commit is contained in:
Lalit
2023-02-11 00:37:10 +05:30
committed by Tim Abbott
parent 3a9fb767ea
commit 1cb4886a23
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/stream_muting.js
View File

@@ -3,6 +3,7 @@ import * as message_lists from "./message_lists";
import * as message_scroll from "./message_scroll"; import * as message_scroll from "./message_scroll";
import * as message_util from "./message_util"; import * as message_util from "./message_util";
import * as message_viewport from "./message_viewport"; import * as message_viewport from "./message_viewport";
import * as narrow_state from "./narrow_state";
import * as navigate from "./navigate"; import * as navigate from "./navigate";
import * as overlays from "./overlays"; import * as overlays from "./overlays";
import * as settings_notifications from "./settings_notifications"; import * as settings_notifications from "./settings_notifications";
@@ -20,7 +21,8 @@ export function update_is_muted(sub, value) {
if (overlays.is_active() || overlays.is_modal_open()) { if (overlays.is_active() || overlays.is_modal_open()) {
saved_ypos = message_viewport.scrollTop(); saved_ypos = message_viewport.scrollTop();
} else if ( } else if (
message_lists.home === message_lists.current && narrow_state.is_message_feed_visible() &&
message_lists.current === message_lists.home &&
message_lists.current.selected_row().offset() !== null message_lists.current.selected_row().offset() !== null
) { ) {
msg_offset = message_lists.current.selected_row().offset().top; msg_offset = message_lists.current.selected_row().offset().top;
@@ -34,7 +36,10 @@ export function update_is_muted(sub, value) {
// Ensure we're still at the same scroll position // Ensure we're still at the same scroll position
if (overlays.is_overlay_or_modal_open()) { if (overlays.is_overlay_or_modal_open()) {
message_viewport.scrollTop(saved_ypos); message_viewport.scrollTop(saved_ypos);
} else if (message_lists.home === message_lists.current) { } else if (
narrow_state.is_message_feed_visible() &&
message_lists.current === message_lists.home
) {
// We pass use_closest to handle the case where the // We pass use_closest to handle the case where the
// currently selected message is being hidden from the // currently selected message is being hidden from the
// home view // home view