paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

js: Move current_msg_list, home_msg_list to ES6 module message_lists.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-03-29 17:21:21 -07:00
committed by Tim Abbott
parent fbf5ff26af
commit d43ac7357a
61 changed files with 409 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
static/js/stream_muting.js
View File

@@ -1,6 +1,7 @@
import $ from "jquery";
import * as message_list from "./message_list";
import * as message_lists from "./message_lists";
import * as message_scroll from "./message_scroll";
import * as message_util from "./message_util";
import * as message_viewport from "./message_viewport";
@@ -18,30 +19,30 @@ export function update_is_muted(sub, value) {
if (overlays.is_active()) {
saved_ypos = message_viewport.scrollTop();
} else if (
home_msg_list === current_msg_list &&
current_msg_list.selected_row().offset() !== null
message_lists.home === message_lists.current &&
message_lists.current.selected_row().offset() !== null
) {
msg_offset = current_msg_list.selected_row().offset().top;
msg_offset = message_lists.current.selected_row().offset().top;
}
home_msg_list.clear({clear_selected_id: false});
message_lists.home.clear({clear_selected_id: false});
// Recreate the home_msg_list with the newly filtered message_list.all
message_util.add_old_messages(message_list.all.all_messages(), home_msg_list);
// Recreate the message_lists.home with the newly filtered message_list.all
message_util.add_old_messages(message_list.all.all_messages(), message_lists.home);
// Ensure we're still at the same scroll position
if (overlays.is_active()) {
message_viewport.scrollTop(saved_ypos);
} else if (home_msg_list === current_msg_list) {
} else if (message_lists.home === message_lists.current) {
// We pass use_closest to handle the case where the
// currently selected message is being hidden from the
// home view
home_msg_list.select_id(home_msg_list.selected_id(), {
message_lists.home.select_id(message_lists.home.selected_id(), {
use_closest: true,
empty_ok: true,
});
if (current_msg_list.selected_id() !== -1) {
current_msg_list.view.set_message_offset(msg_offset);
if (message_lists.current.selected_id() !== -1) {
message_lists.current.view.set_message_offset(msg_offset);
}
}
@@ -53,8 +54,8 @@ export function update_is_muted(sub, value) {
navigate.plan_scroll_to_selected();
message_scroll.suppress_selection_update_on_next_scroll();
if (!home_msg_list.empty()) {
message_util.do_unread_count_updates(home_msg_list.all_messages());
if (!message_lists.home.empty()) {
message_util.do_unread_count_updates(message_lists.home.all_messages());
}
}, 0);