Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

left_sidebar: Move all messages popover to inbox. 

Also, renamed files and variables as needed.
This commit is contained in:
Aman Agrawal 2023-10-03 16:40:44 +00:00 committed by Tim Abbott
parent dd1e06886c
commit 2ec8273c6e
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/src/left_sidebar_navigation_area_popovers.js
View File

@ -1,7 +1,7 @@
import $ from "jquery"; import $ from "jquery";
import render_all_messages_sidebar_actions from "../templates/all_messages_sidebar_actions.hbs";
import render_drafts_sidebar_actions from "../templates/drafts_sidebar_action.hbs"; import render_drafts_sidebar_actions from "../templates/drafts_sidebar_action.hbs";
import render_left_sidebar_inbox_popover from "../templates/left_sidebar_inbox_popover.hbs";
import render_starred_messages_sidebar_actions from "../templates/starred_messages_sidebar_actions.hbs"; import render_starred_messages_sidebar_actions from "../templates/starred_messages_sidebar_actions.hbs";
import * as channel from "./channel"; import * as channel from "./channel";
@ -81,12 +81,12 @@ export function initialize() {
}, },
}); });
// All messages popover // Inbox popover
popover_menus.register_popover_menu(".all-messages-sidebar-menu-icon", { popover_menus.register_popover_menu(".inbox-sidebar-menu-icon", {
...popover_menus.left_sidebar_tippy_options, ...popover_menus.left_sidebar_tippy_options,
onMount(instance) { onMount(instance) {
const $popper = $(instance.popper); const $popper = $(instance.popper);
popover_menus.popover_instances.all_messages = instance; popover_menus.popover_instances.left_sidebar_inbox_popover = instance;
$popper.one("click", "#mark_all_messages_as_read", () => { $popper.one("click", "#mark_all_messages_as_read", () => {
unread_ops.confirm_mark_all_as_read(); unread_ops.confirm_mark_all_as_read();
@ -95,11 +95,11 @@ export function initialize() {
}, },
onShow(instance) { onShow(instance) {
popovers.hide_all(); popovers.hide_all();
instance.setContent(parse_html(render_all_messages_sidebar_actions())); instance.setContent(parse_html(render_left_sidebar_inbox_popover()));
}, },
onHidden(instance) { onHidden(instance) {
instance.destroy(); instance.destroy();
popover_menus.popover_instances.all_messages = undefined; popover_menus.popover_instances.left_sidebar_inbox_popover = undefined;
}, },
}); });
} }

2
web/src/popover_menus.js
View File

@ -24,7 +24,7 @@ export const popover_instances = {
compose_control_buttons: null, compose_control_buttons: null,
starred_messages: null, starred_messages: null,
drafts: null, drafts: null,
all_messages: null, left_sidebar_inbox_popover: null,
message_actions: null, message_actions: null,
stream_settings: null, stream_settings: null,
compose_mobile_button: null, compose_mobile_button: null,

2
web/templates/left_sidebar.hbs
View File

@ -10,6 +10,7 @@
<span class="global-filter-name">{{t 'Inbox' }}</span> <span class="global-filter-name">{{t 'Inbox' }}</span>
<span class="unread_count"></span> <span class="unread_count"></span>
</a> </a>
<span class="arrow sidebar-menu-icon inbox-sidebar-menu-icon hidden-for-spectators"><i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i></span>
</li> </li>
<li class="top_left_recent_view top_left_row"> <li class="top_left_recent_view top_left_row">
<a href="#recent" class="tippy-left-sidebar-tooltip global-filter-container" data-tooltip-template-id="recent-conversations-tooltip-template"> <a href="#recent" class="tippy-left-sidebar-tooltip global-filter-container" data-tooltip-template-id="recent-conversations-tooltip-template">
@ -28,7 +29,6 @@
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
<span class="global-filter-name">{{t 'All messages' }}</span> <span class="global-filter-name">{{t 'All messages' }}</span>
</a> </a>
<span class="arrow sidebar-menu-icon all-messages-sidebar-menu-icon hidden-for-spectators"><i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i></span>
</li> </li>
<li class="top_left_mentions top_left_row hidden-for-spectators"> <li class="top_left_mentions top_left_row hidden-for-spectators">
<a class="global-filter-container" href="#narrow/is/mentioned"> <a class="global-filter-container" href="#narrow/is/mentioned">

0
web/templates/all_messages_sidebar_actions.hbs → web/templates/left_sidebar_inbox_popover.hbs
View File

2
web/tests/left_sidebar_navigation_area.test.js
View File

@ -78,7 +78,7 @@ run_test("update_count_in_dom", () => {
make_elem($(".top_left_mentions"), "<mentioned-count>"); make_elem($(".top_left_mentions"), "<mentioned-count>");
make_elem($(".top_left_all_messages"), "<home-count>"); make_elem($(".top_left_inbox"), "<home-count>");
make_elem($(".top_left_starred_messages"), "<starred-count>"); make_elem($(".top_left_starred_messages"), "<starred-count>");