diff --git a/web/src/stream_list.ts b/web/src/stream_list.ts index f1ca114acd..71a58cf447 100644 --- a/web/src/stream_list.ts +++ b/web/src/stream_list.ts @@ -850,10 +850,10 @@ export function initialize_stream_cursor(): void { } export function initialize({ - on_stream_click, + show_channel_feed, update_inbox_channel_view, }: { - on_stream_click: (stream_id: number, trigger: string) => void; + show_channel_feed: (stream_id: number, trigger: string) => void; update_inbox_channel_view: (channel_id: number) => void; }): void { update_inbox_channel_view_callback = update_inbox_channel_view; @@ -865,7 +865,7 @@ export function initialize({ update_subscribe_to_more_streams_link(); initialize_stream_cursor(); initialize_tippy_tooltips(); - set_event_handlers({on_stream_click}); + set_event_handlers({show_channel_feed}); $("#stream_filters").on("click", ".show-more-topics", (e) => { zoom_in(); @@ -923,9 +923,9 @@ export function initialize_tippy_tooltips(): void { } export function set_event_handlers({ - on_stream_click, + show_channel_feed, }: { - on_stream_click: (stream_id: number, trigger: string) => void; + show_channel_feed: (stream_id: number, trigger: string) => void; }): void { $("#stream_filters").on("click", "li .subscription_block", (e) => { // Left sidebar channel links have an `href` so that the @@ -972,7 +972,7 @@ export function set_event_handlers({ user_settings.web_channel_default_view === web_channel_default_view_values.channel_feed.code ) { - on_stream_click(stream_id, "sidebar"); + show_channel_feed(stream_id, "sidebar"); return; } @@ -1012,7 +1012,7 @@ export function set_event_handlers({ ); browser_history.go_to_location(destination_url); } else { - on_stream_click(stream_id, "sidebar"); + show_channel_feed(stream_id, "sidebar"); return; } }; @@ -1021,7 +1021,7 @@ export function set_event_handlers({ stream_topic_history_util.get_server_history(stream_id, () => { topics = stream_topic_history.get_recent_topic_names(stream_id); if (topics.length === 0) { - on_stream_click(stream_id, "sidebar"); + show_channel_feed(stream_id, "sidebar"); return; } navigate_to_stream(); @@ -1096,7 +1096,7 @@ export function set_event_handlers({ } clear_and_hide_search(); - on_stream_click(stream_id, "sidebar enter key"); + show_channel_feed(stream_id, "sidebar enter key"); } keydown_util.handle({ diff --git a/web/src/ui_init.js b/web/src/ui_init.js index 767cd1f20f..031f388947 100644 --- a/web/src/ui_init.js +++ b/web/src/ui_init.js @@ -561,7 +561,7 @@ export async function initialize_everything(state_data) { left_sidebar_navigation_area.initialize(); stream_list_sort.initialize(); stream_list.initialize({ - on_stream_click(stream_id, trigger) { + show_channel_feed(stream_id, trigger) { const sub = sub_store.get(stream_id); sidebar_ui.hide_all(); popovers.hide_all(); diff --git a/web/tests/stream_list.test.cjs b/web/tests/stream_list.test.cjs index 6ea0399ac7..a9cb35939f 100644 --- a/web/tests/stream_list.test.cjs +++ b/web/tests/stream_list.test.cjs @@ -527,14 +527,14 @@ test_ui("narrowing", ({mock_template}) => { }); test_ui("focusout_user_filter", () => { - stream_list.set_event_handlers({narrow_on_stream_click() {}}); + stream_list.set_event_handlers({narrow_show_channel_feed() {}}); const e = {}; const click_handler = $(".stream-list-filter").get_on_handler("focusout"); click_handler(e); }); test_ui("focus_user_filter", () => { - stream_list.set_event_handlers({narrow_on_stream_click() {}}); + stream_list.set_event_handlers({narrow_show_channel_feed() {}}); initialize_stream_data(); stream_list.build_stream_list();