paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

message_edit: Get message_id from message_row for video_link.

Browse Source 
We remove `data-message-id` from `.video_link` in `message_edit_form`
and get message_id from `message_row` when it is required.
This commit is contained in:
Aman Agrawal
2021-04-21 13:46:11 +00:00
committed by Tim Abbott
parent 84a7f08acc
commit 9816da629b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/compose.js
View File

@@ -28,6 +28,7 @@ import * as people from "./people";
import * as reminder from "./reminder"; import * as reminder from "./reminder";
import * as rendered_markdown from "./rendered_markdown"; import * as rendered_markdown from "./rendered_markdown";
import * as resize from "./resize"; import * as resize from "./resize";
import * as rows from "./rows";
import * as rtl from "./rtl"; import * as rtl from "./rtl";
import * as sent_messages from "./sent_messages"; import * as sent_messages from "./sent_messages";
import * as server_events from "./server_events"; import * as server_events from "./server_events";
@@ -1238,13 +1239,10 @@ export function initialize() {
e.preventDefault(); e.preventDefault();
let target_textarea; let target_textarea;
// The data-message-id attribute is only present in the video let edit_message_id;
// call icon present in the message edit form. If present, if ($(e.target).parents(".message_edit_form").length === 1) {
// the request is for the edit UI; otherwise, it's for the edit_message_id = rows.id($(e.target).parents(".message_row"));
// compose box. target_textarea = $(`#edit_form_${CSS.escape(edit_message_id)} .message_edit_content`);
const edit_message_id = $(e.target).attr("data-message-id");
if (edit_message_id !== undefined) {
target_textarea = $(`#message_edit_content_${CSS.escape(edit_message_id)}`);
} }
let video_call_link; let video_call_link;

2
static/templates/message_edit_form.hbs
View File

@@ -65,7 +65,7 @@
<a role="button" tabindex=0 class="markdown_preview compose_control_button fa fa-eye" aria-label="{{t 'Preview' }}" title="{{t 'Preview' }}"></a> <a role="button" tabindex=0 class="markdown_preview compose_control_button fa fa-eye" aria-label="{{t 'Preview' }}" title="{{t 'Preview' }}"></a>
<a role="button" tabindex=0 class="undo_markdown_preview compose_control_button fa fa-edit" aria-label="{{t 'Write' }}" style="display:none;" title="{{t 'Write' }}"></a> <a role="button" tabindex=0 class="undo_markdown_preview compose_control_button fa fa-edit" aria-label="{{t 'Write' }}" style="display:none;" title="{{t 'Write' }}"></a>
{{#if show_video_chat_button}} {{#if show_video_chat_button}}
<a role="button" tabindex=0 class="compose_control_button fa fa-video-camera video_link" aria-label="{{t "Add video call" }}" data-message-id="{{message_id}}" title="{{t "Add video call" }}"></a> <a role="button" tabindex=0 class="compose_control_button fa fa-video-camera video_link" aria-label="{{t "Add video call" }}" title="{{t "Add video call" }}"></a>
{{/if}} {{/if}}
<a role="button" tabindex=0 class="compose_control_button fa fa-smile-o" aria-label="{{t 'Add emoji' }}" id="emoji_map" data-message-id="{{message_id}}" title="{{t 'Add emoji' }}"></a> <a role="button" tabindex=0 class="compose_control_button fa fa-smile-o" aria-label="{{t 'Add emoji' }}" id="emoji_map" data-message-id="{{message_id}}" title="{{t 'Add emoji' }}"></a>
{{#if giphy_api_available }} {{#if giphy_api_available }}