diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 8d8c392564..28b11ad6d0 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -63,7 +63,7 @@
{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}}
{{.i18n.Tr "repo.issues.filter_label_no_select"}}
{{range .Labels}}
- {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{.Name | RenderEmoji}}
+ {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if contain $.SelLabelIDs .ID}}{{svg "octicon-check"}}{{end}} {{.Name | RenderEmoji}}
{{end}}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 2bfa691d63..b7a31c575b 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -3592,18 +3592,21 @@ function initIssueList() {
fullTextSearch: true
});
+ function excludeLabel (item) {
+ const href = $(item).attr('href');
+ const id = $(item).data('label-id');
+
+ const regStr = `labels=((?:-?[0-9]+%2c)*)(${id})((?:%2c-?[0-9]+)*)&`;
+ const newStr = 'labels=$1-$2$3&';
+
+ window.location = href.replace(new RegExp(regStr), newStr);
+ }
+
$('.menu a.label-filter-item').each(function () {
$(this).on('click', function (e) {
if (e.altKey) {
e.preventDefault();
-
- const href = $(this).attr('href');
- const id = $(this).data('label-id');
-
- const regStr = `labels=(-?[0-9]+%2c)*(${id})(%2c-?[0-9]+)*&`;
- const newStr = 'labels=$1-$2$3&';
-
- window.location = href.replace(new RegExp(regStr), newStr);
+ excludeLabel(this);
}
});
});
@@ -3611,17 +3614,8 @@ function initIssueList() {
$('.menu .ui.dropdown.label-filter').on('keydown', (e) => {
if (e.altKey && e.keyCode === 13) {
const selectedItems = $('.menu .ui.dropdown.label-filter .menu .item.selected');
-
if (selectedItems.length > 0) {
- const item = $(selectedItems[0]);
-
- const href = item.attr('href');
- const id = item.data('label-id');
-
- const regStr = `labels=(-?[0-9]+%2c)*(${id})(%2c-?[0-9]+)*&`;
- const newStr = 'labels=$1-$2$3&';
-
- window.location = href.replace(new RegExp(regStr), newStr);
+ excludeLabel($(selectedItems[0]));
}
}
});