From 68d7d772eb24dea258db01fe19d6042e07b223f9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 6 Mar 2023 11:20:29 +0100 Subject: [PATCH 1/7] Scoped labels: don't require holding alt key to remove (#23303) Alt doesn't work on all browsers, the simplest solution for v1.19 is to just not require it and toggle the label by just clicking. Part of #22974 Co-authored-by: Lauris BH Co-authored-by: Lunny Xiao --- web_src/js/features/repo-legacy.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 22113af169e3..5173a5b59907 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -145,7 +145,6 @@ export function initRepoCommentForm() { const clickedItem = $(this); const scope = $(this).attr('data-scope'); - const canRemoveScope = e.altKey; $(this).parent().find('.item').each(function () { if (scope) { @@ -153,11 +152,7 @@ export function initRepoCommentForm() { if ($(this).attr('data-scope') !== scope) { return true; } - if ($(this).is(clickedItem)) { - if (!canRemoveScope && $(this).hasClass('checked')) { - return true; - } - } else if (!$(this).hasClass('checked')) { + if (!$(this).is(clickedItem) && !$(this).hasClass('checked')) { return true; } } else if (!$(this).is(clickedItem)) { From f0b0f22aeda60c77e377f8869f262217c1895ab8 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Mon, 6 Mar 2023 23:35:24 +0900 Subject: [PATCH 2/7] Add ActionRunStatus component (#23259) Related to: https://github.com/go-gitea/gitea/pull/23212#discussion_r1122856231 Decrease duplication of SvgIcon when display a run status svg. --------- Co-authored-by: Lunny Xiao --- web_src/js/components/ActionRunStatus.vue | 30 +++++++++++++++++++++++ web_src/js/components/RepoActionView.vue | 21 ++++------------ 2 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 web_src/js/components/ActionRunStatus.vue diff --git a/web_src/js/components/ActionRunStatus.vue b/web_src/js/components/ActionRunStatus.vue new file mode 100644 index 000000000000..3717b6495661 --- /dev/null +++ b/web_src/js/components/ActionRunStatus.vue @@ -0,0 +1,30 @@ + + + diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index a5c12c754ece..aadc8369b75e 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -2,10 +2,7 @@
- - - - +
{{ run.title }}
@@ -23,12 +20,7 @@
- - - - - - + {{ job.name }}