1 files changed, 32 insertions, 39 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);
       }
-    });
+    }
   });
 }