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

giphy: Use single element for tooltip and popover. 

This works surprisingly unlike my previous attempts to do so.

WARN: This is a pseudo commit and should only be merged with upcoming
compose box bottom refactoring commit since the css changes required
for this change are missing here and are not required after that
commit.
This commit is contained in:
Aman Agrawal 2021-11-12 05:18:03 +00:00 committed by Tim Abbott
parent 3423797efa
commit 29cdd99220
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/giphy.js
View File

@ -46,9 +46,9 @@ export function update_giphy_rating() {
page_params.realm_giphy_rating === page_params.giphy_rating_options.disabled.id || page_params.realm_giphy_rating === page_params.giphy_rating_options.disabled.id ||
page_params.giphy_api_key === "" page_params.giphy_api_key === ""
) { ) {
$(".compose_giphy_link").hide(); $(".compose_gif_icon").hide();
} else { } else {
$(".compose_giphy_link").show(); $(".compose_gif_icon").show();
} }
} }
@ -220,7 +220,7 @@ export function initialize() {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
if (active_popover_element && $.contains(active_popover_element.get()[0], e.target)) { if (active_popover_element && active_popover_element.get()[0] === e.target) {
// Hide giphy popover if already active. // Hide giphy popover if already active.
hide_giphy_popover(); hide_giphy_popover();
return; return;
@ -235,7 +235,7 @@ export function initialize() {
edit_message_id = undefined; edit_message_id = undefined;
} }
active_popover_element = $elt.closest(".compose_giphy_link"); active_popover_element = $elt;
active_popover_element.popover({ active_popover_element.popover({
animation: true, animation: true,
placement: get_popover_placement(), placement: get_popover_placement(),

4
static/templates/compose_control_buttons.hbs
View File

@ -7,7 +7,5 @@
<a role="button" class="compose_control_button fa fa-video-camera video_link" aria-label="{{t 'Add video call' }}" tabindex=0 data-tippy-content="{{t 'Add video call' }}"></a> <a role="button" class="compose_control_button fa fa-video-camera video_link" aria-label="{{t 'Add video call' }}" tabindex=0 data-tippy-content="{{t 'Add video call' }}"></a>
<a role="button" class="compose_control_button fa fa-smile-o emoji_map" aria-label="{{t 'Add emoji' }}" tabindex=0 data-tippy-content="{{t 'Add emoji' }}"></a> <a role="button" class="compose_control_button fa fa-smile-o emoji_map" aria-label="{{t 'Add emoji' }}" tabindex=0 data-tippy-content="{{t 'Add emoji' }}"></a>
<a role="button" class="compose_control_button fa fa-clock-o time_pick" aria-label="{{t 'Add global time' }}" tabindex=0 data-tippy-content="{{t 'Add global time<br />Everyone sees global times in their own time zone.' }}" data-tippy-maxWidth="none" data-tippy-allowHtml="true"></a> <a role="button" class="compose_control_button fa fa-clock-o time_pick" aria-label="{{t 'Add global time' }}" tabindex=0 data-tippy-content="{{t 'Add global time<br />Everyone sees global times in their own time zone.' }}" data-tippy-maxWidth="none" data-tippy-allowHtml="true"></a>
<a role="button" class="compose_control_button compose_giphy_link {{#unless giphy_enabled }} hide {{/unless}}" aria-label="{{t 'Add GIF' }}" data-tippy-content="{{t 'Add GIF' }}"> <a role="button" class="compose_control_button compose_gif_icon {{#unless giphy_enabled }} hide {{/unless}} zulip-icon zulip-icon-gif" aria-label="{{t 'Add GIF' }}" tabindex=0 data-tippy-content="{{t 'Add GIF' }}"></a>
<i class="compose_gif_icon zulip-icon zulip-icon-gif" tabindex=0></i>
</a>
<a role="button" class="message-control-link" tabindex=0 data-overlay-trigger="message-formatting">{{t 'Help' }}</a> <a role="button" class="message-control-link" tabindex=0 data-overlay-trigger="message-formatting">{{t 'Help' }}</a>