Skip to content

Commit db40f1f

Browse files
silverwindGiteaBot
authored andcommittedMar 17, 2023
1 parent 0982402 commit db40f1f

File tree

4 files changed

+23
-16
lines changed

4 files changed

+23
-16
lines changed
 

‎templates/repo/diff/box.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{{svg "octicon-diff" 16 "gt-mr-2"}}{{.locale.Tr "repo.diff.stats_desc" .Diff.NumFiles .Diff.TotalAddition .Diff.TotalDeletion | Str2html}}
2525
</div>
2626
</div>
27-
<div class="diff-detail-actions gt-df gt-ac gt-w-100">
27+
<div class="diff-detail-actions gt-df gt-ac">
2828
{{if and .PageIsPullFiles $.SignedUserID (not .IsArchived)}}
2929
<progress id="viewed-files-summary" class="gt-mr-2" value="{{.Diff.NumViewedFiles}}" max="{{.Diff.NumFiles}}"></progress>
3030
<label for="viewed-files-summary" id="viewed-files-summary-label" class="gt-mr-3 gt-f1" data-text-changed-template="{{.locale.Tr "repo.pulls.viewed_files_label"}}">

‎templates/repo/diff/new_review.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<span class="ui small label review-comments-counter" data-pending-comment-number="{{.PendingCodeCommentNumber}}">{{.PendingCodeCommentNumber}}</span>
55
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
66
</button>
7-
<div class="review-box-panel gt-hidden">
7+
<div class="review-box-panel tippy-target">
88
<div class="ui segment">
99
<form class="ui form" action="{{.Link}}/reviews/submit" method="post">
1010
{{.CsrfTokenHtml}}

‎web_src/css/review.css

+4-8
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,10 @@ a.blob-excerpt:hover {
214214
color: var(--color-primary-contrast);
215215
}
216216

217+
.review-box-panel .ui.segment {
218+
border: none;
219+
}
220+
217221
/* See the comment of createCommentEasyMDE() for the review editor */
218222
/* EasyMDE's options can not handle minHeight & maxHeight together correctly, we have to set minHeight in JS code */
219223
.review-box-panel .CodeMirror-scroll {
@@ -249,14 +253,6 @@ a.blob-excerpt:hover {
249253
position: relative;
250254
}
251255

252-
.review-box-panel {
253-
position: absolute;
254-
min-width: max-content;
255-
top: 45px;
256-
right: -5px;
257-
z-index: 2;
258-
}
259-
260256
#review-box .review-comments-counter {
261257
background-color: var(--color-primary-light-4);
262258
color: var(--color-primary-contrast);

‎web_src/js/features/repo-issue.js

+17-6
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {attachTribute} from './tribute.js';
44
import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
55
import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
66
import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
7-
import {initTooltip, showTemporaryTooltip} from '../modules/tippy.js';
7+
import {initTooltip, showTemporaryTooltip, createTippy} from '../modules/tippy.js';
88
import {hideElem, showElem, toggleElem} from '../utils/dom.js';
99

1010
const {appSubUrl, csrfToken} = window.config;
@@ -491,12 +491,23 @@ export function initRepoPullRequestReview() {
491491
return;
492492
}
493493

494-
$('.js-btn-review').on('click', function (e) {
495-
e.preventDefault();
496-
toggleElem($(this).parent().find('.review-box-panel'));
497-
}).parent().find('.review-box-panel .close').on('click', function (e) {
494+
const $reviewBtn = $('.js-btn-review');
495+
const $panel = $reviewBtn.parent().find('.review-box-panel');
496+
const $closeBtn = $panel.find('.close');
497+
498+
const tippy = createTippy($reviewBtn[0], {
499+
content: $panel[0],
500+
placement: 'bottom',
501+
trigger: 'click',
502+
role: 'menu',
503+
maxWidth: 'none',
504+
interactive: true,
505+
hideOnClick: true,
506+
});
507+
508+
$closeBtn.on('click', (e) => {
498509
e.preventDefault();
499-
hideElem($(this).closest('.review-box-panel'));
510+
tippy.hide();
500511
});
501512

502513
$(document).on('click', 'a.add-code-comment', async function (e) {

0 commit comments

Comments
 (0)