Improve reviewing PR UX (#19612)
This commit is contained in:
parent
5a9c505e14
commit
0eac09e066
7 changed files with 74 additions and 3 deletions
|
@ -6,8 +6,23 @@ import {validateTextareaNonEmpty} from './comp/EasyMDE.js';
|
|||
const {csrfToken} = window.config;
|
||||
|
||||
export function initRepoDiffReviewButton() {
|
||||
const $reviewBox = $('#review-box');
|
||||
const $counter = $reviewBox.find('.review-comments-counter');
|
||||
|
||||
$(document).on('click', 'button[name="is_review"]', (e) => {
|
||||
$(e.target).closest('form').append('<input type="hidden" name="is_review" value="true">');
|
||||
const $form = $(e.target).closest('form');
|
||||
$form.append('<input type="hidden" name="is_review" value="true">');
|
||||
|
||||
// Watch for the form's submit event.
|
||||
$form.on('submit', () => {
|
||||
const num = parseInt($counter.attr('data-pending-comment-number')) + 1 || 1;
|
||||
$counter.attr('data-pending-comment-number', num);
|
||||
$counter.text(num);
|
||||
// Force the browser to reflow the DOM. This is to ensure that the browser replay the animation
|
||||
$reviewBox.removeClass('pulse');
|
||||
$reviewBox.width();
|
||||
$reviewBox.addClass('pulse');
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -160,6 +160,16 @@ export function initRepoIssueCommentDelete() {
|
|||
_csrf: csrfToken,
|
||||
}).done(() => {
|
||||
const $conversationHolder = $this.closest('.conversation-holder');
|
||||
|
||||
// Check if this was a pending comment.
|
||||
if ($conversationHolder.find('.pending-label').length) {
|
||||
const $counter = $('#review-box .review-comments-counter');
|
||||
let num = parseInt($counter.attr('data-pending-comment-number')) - 1 || 0;
|
||||
num = Math.max(num, 0);
|
||||
$counter.attr('data-pending-comment-number', num);
|
||||
$counter.text(num);
|
||||
}
|
||||
|
||||
$(`#${$this.data('comment-id')}`).remove();
|
||||
if ($conversationHolder.length && !$conversationHolder.find('.comment').length) {
|
||||
const path = $conversationHolder.data('path');
|
||||
|
|
|
@ -242,6 +242,19 @@ a.blob-excerpt:hover {
|
|||
border: none !important;
|
||||
}
|
||||
|
||||
#review-box .review-comments-counter {
|
||||
background-color: var(--color-primary-light-4);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
#review-box:hover .review-comments-counter {
|
||||
background-color: var(--color-primary-light-5);
|
||||
}
|
||||
|
||||
#review-box .review-comments-counter[data-pending-comment-number="0"] {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.pull.files.diff [id] {
|
||||
scroll-margin-top: 99px;
|
||||
|
||||
|
|
|
@ -50,3 +50,19 @@
|
|||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes pulse {
|
||||
0% {
|
||||
transform: scale(1);
|
||||
}
|
||||
50% {
|
||||
transform: scale(1.8);
|
||||
}
|
||||
100% {
|
||||
transform: scale(1);
|
||||
}
|
||||
}
|
||||
|
||||
.pulse {
|
||||
animation: pulse 2s linear;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue