paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

emoji_map: Convert from id to class.

Browse Source 
Since it can present in multiple elements, we use it as a class.
This commit is contained in:
Aman Agrawal
2021-04-20 20:17:13 +00:00
committed by Tim Abbott
parent 9816da629b
commit 54b31df1b6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/click_handlers.js
View File

@@ -671,7 +671,7 @@ export function initialize() {
function handle_compose_click(e) {
// Emoji clicks should be handled by their own click handler in emoji_picker.js
if ($(e.target).is("#emoji_map, img.emoji, .drag, .compose_giphy_logo")) {
if ($(e.target).is(".emoji_map, img.emoji, .drag, .compose_giphy_logo")) {
return;
}

2
static/js/emoji_picker.js
View File

@@ -700,7 +700,7 @@ export function register_click_handlers() {
hide_emoji_popover();
});
$("body").on("click", "#emoji_map", function (e) {
$("body").on("click", ".emoji_map", function (e) {
e.preventDefault();
e.stopPropagation();
// The data-message-id attribute is only present in the emoji icon present in

2
static/templates/compose_control_buttons.hbs
View File

@@ -5,7 +5,7 @@
<a role="button" class="markdown_preview compose_control_button fa fa-eye" aria-label="{{t 'Preview' }}" tabindex=0 title="{{t 'Preview' }}"></a>
<a role="button" class="undo_markdown_preview compose_control_button fa fa-edit" aria-label="{{t 'Write' }}" tabindex=0 style="display:none;" title="{{t 'Write' }}"></a>
<a role="button" class="compose_control_button fa fa-video-camera video_link" aria-label="{{t 'Add video call' }}" tabindex=0 title="{{t 'Add video call' }}"></a>
<a role="button" class="compose_control_button fa fa-smile-o" aria-label="{{t 'Add emoji' }}" id="emoji_map" tabindex=0 title="{{t 'Add emoji' }}"></a>
<a role="button" class="compose_control_button fa fa-smile-o emoji_map" aria-label="{{t 'Add emoji' }}" tabindex=0 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" />

2
static/templates/message_edit_form.hbs
View File

@@ -67,7 +67,7 @@
{{#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" }}" title="{{t "Add video call" }}"></a>
{{/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="emoji_map compose_control_button fa fa-smile-o" aria-label="{{t 'Add emoji' }}" data-message-id="{{message_id}}" 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}}" />