Skip to content

Commit 224ee0d

Browse files
authored
Fix strange UI behavior of cancelling dismiss review modal (#25172)
Backport clean cherry-picks of #25133 and #25162 to 1.20.
1 parent ee26d1c commit 224ee0d

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
</div>
5959
<div class="gt-df gt-ac gt-gap-3">
6060
{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}
61-
<a href="#" class="ui muted icon gt-df gt-ac dismiss-review-btn" data-review-id="dismiss-review-{{.Review.ID}}" data-tooltip-content="{{$.locale.Tr "repo.issues.dismiss_review"}}">
61+
<a href="#" class="ui muted icon gt-df gt-ac show-modal" data-tooltip-content="{{$.locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}">
6262
{{svg "octicon-x" 20}}
6363
</a>
64-
<div class="ui small modal" id="dismiss-review-modal">
64+
<div class="ui small modal" id="dismiss-review-modal-{{.Review.ID}}">
6565
<div class="header">
6666
{{$.locale.Tr "repo.issues.dismiss_review"}}
6767
</div>

web_src/js/features/repo-issue.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -358,13 +358,6 @@ export function initRepoIssueComments() {
358358
).then(() => window.location.reload());
359359
});
360360

361-
$('.dismiss-review-btn').on('click', function (e) {
362-
e.preventDefault();
363-
const $this = $(this);
364-
const $dismissReviewModal = $this.next();
365-
$dismissReviewModal.modal('show');
366-
});
367-
368361
$(document).on('click', (event) => {
369362
const urlTarget = $(':target');
370363
if (urlTarget.length === 0) return;

0 commit comments

Comments
 (0)