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

user_card_popover: Show popover on user mention in drafts overlay. 

We introduce `has_message_context` as an additional argument to
`toggle_user_card_popover_for_message`. `has_message_context` is set to
false for all messages that have not been sent yet i.e. drafts and in
the future commits: scheduled messages, compose box, edit message box.

It would be good to have defined the event listener in
`user_card_popover.js` to keep everything in one place, but since direct
event handlers were getting invoked before delegated event handlers, we
had to define direct event handlers in the launch function of drafts
overlay ui.
This commit is contained in:
Shubham Padia 2024-07-25 08:29:33 +00:00 committed by Tim Abbott
parent 0cede4cca6
commit d983d0ec2e
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/drafts_overlay_ui.js
View File

@ -13,6 +13,7 @@ import * as overlays from "./overlays";
import * as people from "./people";
import * as rendered_markdown from "./rendered_markdown";
import * as stream_data from "./stream_data";
import * as user_card_popover from "./user_card_popover";
function restore_draft(draft_id) {
const draft = drafts.draft_model.getDraft(draft_id);
@ -192,6 +193,10 @@ export function launch() {
restore_draft(draft_id);
});
$("#drafts_table .restore-overlay-message").on("click", ".user-mention", (e) => {
user_card_popover.unsaved_message_user_mention_event_handler(e);
});
$("#drafts_table .overlay_message_controls .delete-overlay-message").on(
"click",
function () {

31
web/src/user_card_popover.js
View File

@ -415,7 +415,13 @@ function load_medium_avatar(user, $elt) {
// user is the user whose profile to show.
// sender_id is the user id of the sender for the message we are
// showing the popover from.
function toggle_user_card_popover_for_message(element, user, sender_id, on_mount) {
function toggle_user_card_popover_for_message(
element,
user,
sender_id,
has_message_context,
on_mount,
) {
const $elt = $(element);
const is_sender_popover = sender_id === user.user_id;
@ -423,7 +429,7 @@ function toggle_user_card_popover_for_message(element, user, sender_id, on_mount
user,
$elt,
is_sender_popover,
true,
has_message_context,
"respond_personal_button",
"message_user_card",
"right",
@ -431,6 +437,21 @@ function toggle_user_card_popover_for_message(element, user, sender_id, on_mount
);
}
export function unsaved_message_user_mention_event_handler(e) {
e.stopPropagation();
const id_string = $(e.target).attr("data-user-id");
// Do not open popover for @all mention
if (id_string === "*") {
return;
}
const user_id = Number.parseInt(id_string, 10);
const user = people.get_by_user_id(user_id);
toggle_user_card_popover_for_message($(e.target), user, current_user.user_id, false);
}
// This function serves as the entry point for toggling
// the user card popover via keyboard shortcut.
export function toggle_sender_info() {
@ -453,7 +474,7 @@ export function toggle_sender_info() {
assert(message_lists.current !== undefined);
const message = message_lists.current.get(rows.id($message));
const user = people.get_by_user_id(message.sender_id);
toggle_user_card_popover_for_message($sender[0], user, message.sender_id, () => {
toggle_user_card_popover_for_message($sender[0], user, message.sender_id, true, () => {
if (!page_params.is_spectator) {
focus_user_card_popover_item();
}
@ -525,7 +546,7 @@ function register_click_handlers() {
assert(message_lists.current !== undefined);
const message = message_lists.current.get(rows.id($row));
const user = people.get_by_user_id(message.sender_id);
toggle_user_card_popover_for_message(this, user, message.sender_id);
toggle_user_card_popover_for_message(this, user, message.sender_id, true);
});
$("#main_div").on("click", ".user-mention", function (e) {
@ -556,7 +577,7 @@ function register_click_handlers() {
return;
}
}
toggle_user_card_popover_for_message(this, user, message.sender_id);
toggle_user_card_popover_for_message(this, user, message.sender_id, true);
});
$("body").on("click", ".user-card-popover-actions .narrow_to_private_messages", (e) => {