aboutsummaryrefslogtreecommitdiffstats
path: root/web_src/js/features/comp
diff options
context:
space:
mode:
authorGiteabot <teabot@gitea.io>2024-04-14 19:58:48 +0800
committerGitHub <noreply@github.com>2024-04-14 11:58:48 +0000
commit0352b992218d21af5937c11e52fb303f5792d607 (patch)
treefc8b0e2d4aaae1b877ea90bd3bfad260b1ee2fd5 /web_src/js/features/comp
parentdd128610115c62c96bd1f9df09aae32603c17c17 (diff)
downloadgitea-0352b992218d21af5937c11e52fb303f5792d607.tar.gz
gitea-0352b992218d21af5937c11e52fb303f5792d607.zip
Rewrite and restyle reaction selector and enable no-sizzle eslint rule (#30453) (#30473)
Backport #30453 by @silverwind Enable `no-sizzle` lint rule, there was only one use in `initCompReactionSelector` which I have rewritten as follows: - Remove all jQuery except the necessary fomantic dropdown init - Remove the recursion, instead bind event listeners to common parent container nodes Did various tests, works with our without attachments, in diff view and in diff comments inside comment list. Additionally the style of reactions now matches between code comments and issue comments: <img width="275" alt="Screenshot 2024-04-13 at 14 58 10" src="https://github.com/go-gitea/gitea/assets/115237/9d08f188-8661-4dd9-bff4-cad6d6d09cab"> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'web_src/js/features/comp')
-rw-r--r--web_src/js/features/comp/ReactionSelector.js56
1 files changed, 27 insertions, 29 deletions
diff --git a/web_src/js/features/comp/ReactionSelector.js b/web_src/js/features/comp/ReactionSelector.js
index 2def3db51a..e507b89632 100644
--- a/web_src/js/features/comp/ReactionSelector.js
+++ b/web_src/js/features/comp/ReactionSelector.js
@@ -1,38 +1,36 @@
import $ from 'jquery';
import {POST} from '../../modules/fetch.js';
-export function initCompReactionSelector($parent) {
- $parent.find(`.select-reaction .item.reaction, .comment-reaction-button`).on('click', async function (e) {
- e.preventDefault();
+export function initCompReactionSelector() {
+ for (const container of document.querySelectorAll('.issue-content, .diff-file-body')) {
+ container.addEventListener('click', async (e) => {
+ // there are 2 places for the "reaction" buttons, one is the top-right reaction menu, one is the bottom of the comment
+ const target = e.target.closest('.comment-reaction-button');
+ if (!target) return;
+ e.preventDefault();
- if (this.classList.contains('disabled')) return;
+ if (target.classList.contains('disabled')) return;
- const actionUrl = this.closest('[data-action-url]')?.getAttribute('data-action-url');
- const reactionContent = this.getAttribute('data-reaction-content');
- const hasReacted = this.closest('.ui.segment.reactions')?.querySelector(`a[data-reaction-content="${reactionContent}"]`)?.getAttribute('data-has-reacted') === 'true';
+ const actionUrl = target.closest('[data-action-url]').getAttribute('data-action-url');
+ const reactionContent = target.getAttribute('data-reaction-content');
- const res = await POST(`${actionUrl}/${hasReacted ? 'unreact' : 'react'}`, {
- data: new URLSearchParams({content: reactionContent}),
- });
+ const commentContainer = target.closest('.comment-container');
- 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();
- }
- 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);
+ const bottomReactions = commentContainer.querySelector('.bottom-reactions'); // may not exist if there is no reaction
+ const bottomReactionBtn = bottomReactions?.querySelector(`a[data-reaction-content="${CSS.escape(reactionContent)}"]`);
+ const hasReacted = bottomReactionBtn?.getAttribute('data-has-reacted') === 'true';
+
+ const res = await POST(`${actionUrl}/${hasReacted ? 'unreact' : 'react'}`, {
+ data: new URLSearchParams({content: reactionContent}),
+ });
+
+ const data = await res.json();
+ bottomReactions?.remove();
+ if (data.html) {
+ commentContainer.insertAdjacentHTML('beforeend', data.html);
+ const bottomReactionsDropdowns = commentContainer.querySelectorAll('.bottom-reactions .dropdown.select-reaction');
+ $(bottomReactionsDropdowns).dropdown(); // re-init the dropdown
}
- }
- });
+ });
+ }
}