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

tippy: Fix vertical stacking for reaction button during message-fade.

Browse Source 
This fixes the same bug in the previous commit for add reaction
button.
This commit is contained in:
Aman Agrawal
2021-06-09 12:53:10 +00:00
committed by Tim Abbott
parent 3e2b6b52d8
commit 99e6f25c4e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/tippyjs.js
View File

@@ -52,14 +52,16 @@ export function initialize() {
// message reaction tooltip showing who reacted. // message reaction tooltip showing who reacted.
let observer; let observer;
delegate("body", { delegate("body", {
target: ".message_reaction", target: ".message_reaction, .reaction_button",
placement: "bottom", placement: "bottom",
onShow(instance) { onShow(instance) {
const elem = $(instance.reference); const elem = $(instance.reference);
if (!instance.reference.classList.contains("reaction_button")) {
const local_id = elem.attr("data-reaction-id"); const local_id = elem.attr("data-reaction-id");
const message_id = rows.get_message_id(instance.reference); const message_id = rows.get_message_id(instance.reference);
const title = reactions.get_reaction_title_data(message_id, local_id); const title = reactions.get_reaction_title_data(message_id, local_id);
instance.setContent(title); instance.setContent(title);
}
// Use MutationObserver to check for removal of nodes on which tooltips // Use MutationObserver to check for removal of nodes on which tooltips
// are still active. // are still active.

2
static/templates/message_reactions.hbs
View File

@@ -1,7 +1,7 @@
{{#each this/msg/message_reactions}} {{#each this/msg/message_reactions}}
{{> message_reaction}} {{> message_reaction}}
{{/each}} {{/each}}
<div class="reaction_button tippy-zulip-tooltip" data-tippy-content="{{t 'Add emoji reaction' }}" aria-label="{{t 'Add emoji reaction' }} (:)"> <div class="reaction_button" data-tippy-content="{{t 'Add emoji reaction' }}" aria-label="{{t 'Add emoji reaction' }} (:)">
<i class="fa fa-smile-o" role="button" aria-haspopup="true" tabindex="0" aria-label="{{t 'Add emoji reaction' }} (:)"></i> <i class="fa fa-smile-o" role="button" aria-haspopup="true" tabindex="0" aria-label="{{t 'Add emoji reaction' }} (:)"></i>
<div class="message_reaction_count">+</div> <div class="message_reaction_count">+</div>
</div> </div>