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

giphy: Get message_id for `compose_giphy_logo` from `.message_row`.

This commit is contained in:
Aman Agrawal 2021-04-20 21:19:08 +00:00 committed by Tim Abbott
parent 4a55296377
commit 4c60585820
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/giphy.js
View File

@ -10,6 +10,7 @@ import * as compose_ui from "./compose_ui";
import {media_breakpoints_num} from "./css_variables";
import {page_params} from "./page_params";
import * as popovers from "./popovers";
import * as rows from "./rows";
import * as ui_util from "./ui_util";
const giphy_fetch = new GiphyFetch(page_params.giphy_api_key);
@ -188,10 +189,13 @@ export function initialize() {
}
popovers.hide_all();
const $elt = $(e.target);
// Store data-message-id value in global variable edit_message_id so that
if ($elt.parents(".message_edit_form").length === 1) {
// Store message id in global variable edit_message_id so that
// its value can be further used to correctly find the message textarea element.
// This will store `undefined` when called from compose box, by design.
edit_message_id = $elt.attr("data-message-id");
edit_message_id = rows.id($elt.parents(".message_row"));
} else {
edit_message_id = undefined;
}
active_popover_element = $elt.closest("#compose_box_giphy_grid");
active_popover_element.popover({

2
static/templates/message_edit_form.hbs
View File

@ -70,7 +70,7 @@
<a role="button" tabindex=0 class="emoji_map compose_control_button fa fa-smile-o" aria-label="{{t 'Add emoji' }}" title="{{t 'Add emoji' }}"></a>
{{#if giphy_api_available }}
<a role="button" class="compose_control_button" aria-label="{{t 'Add GIF' }}" id="compose_box_giphy_grid" title="{{t 'Add GIF' }}">
<img class="compose_giphy_logo" tabindex=0 src="/static/images/GIPHY_logo.png" data-message-id="{{message_id}}" />
<img class="compose_giphy_logo" tabindex=0 src="/static/images/GIPHY_logo.png">
</a>
{{/if}}
<a role="button" tabindex=0 class="message-control-link" data-overlay-trigger="message-formatting" >{{t 'Help' }}</a>