Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

popover-menu-data: Set message row when getting popover context.

Lauryn Menard579f04fccd6b
diff --git a/web/src/popover_menus_data.ts b/web/src/popover_menus_data.ts
index 9930bd2846a..ddac85a4481 100644
--- a/web/src/popover_menus_data.ts
+++ b/web/src/popover_menus_data.ts
@@ -147,6 +147,7 @@ type BillingInfo = {
export function get_actions_popover_content_context(message_id: number): ActionPopoverContext {
assert(message_lists.current !== undefined);
+ const $message_row = message_lists.current.get_row(message_id);
const message = message_lists.current.get(message_id);
assert(message !== undefined);
const not_spectator = !page_params.is_spectator;
@@ -223,9 +224,7 @@ export function get_actions_popover_content_context(message_id: number): ActionP
return true;
};
- function is_add_reaction_icon_visible(): boolean {
- assert(message_lists.current !== undefined);
- const $message_row = message_lists.current.get_row(message_id);
+ function is_add_reaction_icon_visible($message_row: JQuery): boolean {
const $reaction_button = $message_row.find(".message_controls .reaction_button");
return $reaction_button.length === 1 && $reaction_button.css("display") !== "none";
}
@@ -235,7 +234,7 @@ export function get_actions_popover_content_context(message_id: number): ActionP
// popover if it is not displayed.
const should_display_add_reaction_option =
!message.is_me_message &&
- !is_add_reaction_icon_visible() &&
+ !is_add_reaction_icon_visible($message_row) &&
not_spectator &&
!(stream_id && stream_data.is_stream_archived_by_id(stream_id));