5 files changed, 42 insertions, 44 deletions

diff --git a/web_src/js/features/comp/ReactionSelector.js b/web_src/js/features/comp/ReactionSelector.js
index 33ceb73c7c..336634a582 100644
--- a/web_src/js/features/comp/ReactionSelector.js
+++ b/web_src/js/features/comp/ReactionSelector.js
@@ -1,53 +1,46 @@
 import $ from 'jquery';
-import {createTippy} from '../../modules/tippy.js';
 
 const {csrfToken} = window.config;
 
-export function initCompReactionSelector(parent) {
-  let selector = 'a.label';
-  if (!parent) {
-    parent = $(document);
-    selector = `.reactions ${selector}`;
-  }
-
-  for (const el of parent[0].querySelectorAll(selector)) {
-    createTippy(el, {placement: 'bottom-start', content: el.getAttribute('data-title')});
-  }
-
-  parent.find(`.select-reaction > .menu > .item, ${selector}`).on('click', function (e) {
+export function initCompReactionSelector($parent) {
+  $parent.find(`.select-reaction .item.reaction, .comment-reaction-button`).on('click', async function (e) {
     e.preventDefault();
 
     if ($(this).hasClass('disabled')) return;
 
-    const actionURL = $(this).hasClass('item') ? $(this).closest('.select-reaction').data('action-url') : $(this).data('action-url');
-    const url = `${actionURL}/${$(this).hasClass('primary') ? 'unreact' : 'react'}`;
-    $.ajax({
-      type: 'POST',
-      url,
-      data: {
+    const actionUrl = $(this).closest('[data-action-url]').attr('data-action-url');
+    const reactionContent = $(this).attr('data-reaction-content');
+    const hasReacted = $(this).closest('.ui.segment.reactions').find(`a[data-reaction-content="${reactionContent}"]`).attr('data-has-reacted') === 'true';
+
+    const res = await fetch(`${actionUrl}/${hasReacted ? 'unreact' : 'react'}`, {
+      method: 'POST',
+      headers: {
+        'content-type': 'application/x-www-form-urlencoded',
+      },
+      body: new URLSearchParams({
         _csrf: csrfToken,
-        content: $(this).attr('data-reaction-content'),
+        content: reactionContent,
+      }),
+    });
+
+    const data = await res.json();
+    if (data && (data.html || data.empty)) {
+      const content = $(this).closest('.content');
+      let react = content.find('.segment.reactions');
+      if ((!data.empty || data.html === '') && react.length > 0) {
+        react.remove();
       }
-    }).done((resp) => {
-      if (resp && (resp.html || resp.empty)) {
-        const content = $(this).closest('.content');
-        let react = content.find('.segment.reactions');
-        if ((!resp.empty || resp.html === '') && react.length > 0) {
-          react.remove();
-        }
-        if (!resp.empty) {
-          react = $('<div class="ui attached segment reactions"></div>');
-          const attachments = content.find('.segment.bottom:first');
-          if (attachments.length > 0) {
-            react.insertBefore(attachments);
-          } else {
-            react.appendTo(content);
-          }
-          react.html(resp.html);
-          react.find('.dropdown').dropdown();
-          initCompReactionSelector(react);
+      if (!data.empty) {
+        const attachments = content.find('.segment.bottom:first');
+        react = $(data.html);
+        if (attachments.length > 0) {
+          react.insertBefore(attachments);
+        } else {
+          react.appendTo(content);
         }
+        react.find('.dropdown').dropdown();
+        initCompReactionSelector(react);
       }
-    });
+    }
   });
 }
diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js
index 73eccaf193..26d8e22472 100644
--- a/web_src/js/features/repo-code.js
+++ b/web_src/js/features/repo-code.js
@@ -190,8 +190,6 @@ export function initRepoCodeView() {
     currentTarget.closest('tr').outerHTML = blob;
   });
   $(document).on('click', '.copy-line-permalink', async (e) => {
-    const success = await clippie(toAbsoluteUrl(e.currentTarget.getAttribute('data-url')));
-    if (!success) return;
-    document.querySelector('.code-line-button')?._tippy?.hide();
+    await clippie(toAbsoluteUrl(e.currentTarget.getAttribute('data-url')));
   });
 }
diff --git a/web_src/js/features/repo-issue-content.js b/web_src/js/features/repo-issue-content.js
index 87295573e8..792a11c5ab 100644
--- a/web_src/js/features/repo-issue-content.js
+++ b/web_src/js/features/repo-issue-content.js
@@ -76,7 +76,7 @@ function showContentHistoryMenu(issueBaseUrl, $item, commentId) {
   const $headerLeft = $item.find('.comment-header-left');
   const menuHtml = `
   <div class="ui pointing dropdown top left content-history-menu" data-comment-id="${commentId}">
-    &bull; <a>${i18nTextEdited}${svg('octicon-triangle-down', 14, 'dropdown icon gt-ml-1 gt-mt-1')}</a>
+    &bull; <a class="muted">${i18nTextEdited}${svg('octicon-triangle-down', 14, 'dropdown icon gt-ml-1 gt-mt-1')}</a>
     <div class="menu">
     </div>
   </div>`;
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
index 2804844d81..f23ff45470 100644
--- a/web_src/js/features/repo-legacy.js
+++ b/web_src/js/features/repo-legacy.js
@@ -544,7 +544,7 @@ export function initRepository() {
     initRepoIssueDependencyDelete();
     initRepoIssueCodeCommentCancel();
     initRepoPullRequestUpdate();
-    initCompReactionSelector();
+    initCompReactionSelector($(document));
 
     initRepoPullRequestMergeForm();
   }
diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index df2143b0ef..d9f496fb85 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -58,10 +58,17 @@ function attachTooltip(target, content = null) {
   content = content ?? target.getAttribute('data-tooltip-content');
   if (!content) return null;
 
+  // when element has a clipboard target, we update the tooltip after copy
+  // in which case it is undesirable to automatically hide it on click as
+  // it would momentarily flash the tooltip out and in.
+  const hasClipboardTarget = target.hasAttribute('data-clipboard-target');
+  const hideOnClick = !hasClipboardTarget;
+
   const props = {
     content,
     delay: 100,
     role: 'tooltip',
+    hideOnClick,
     placement: target.getAttribute('data-tooltip-placement') || 'top-start',
     ...(target.getAttribute('data-tooltip-interactive') === 'true' ? {interactive: true, aria: {content: 'describedby', expanded: false}} : {}),
   };