Skip to content

Commit 1957c87

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 64825ec commit 1957c87

File tree

6 files changed

+37
-54
lines changed

6 files changed

+37
-54
lines changed

‎templates/repo/diff/box.tmpl

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,24 +164,22 @@
164164
<input type="checkbox" name="{{$file.GetDiffFileName}}" autocomplete="off"{{if $file.IsViewed}} checked{{end}}> {{ctx.Locale.Tr "repo.pulls.has_viewed_file"}}
165165
</label>
166166
{{end}}
167-
<div class="ui tiny js-btn-diff-file-menu">
168-
{{svg "octicon-kebab-horizontal" 18 "icon tw-mx-2"}}
169-
<div class="tippy-target">
170-
{{if not (or $file.IsIncomplete $file.IsBin $file.IsSubmodule)}}
171-
<a class="unescape-button item">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</a>
172-
<a class="escape-button tw-hidden item">{{ctx.Locale.Tr "repo.escape_control_characters"}}</a>
173-
{{end}}
174-
{{if and (not $file.IsSubmodule) (not $.PageIsWiki)}}
175-
{{if $file.IsDeleted}}
176-
<a class="item" rel="nofollow" href="{{$.BeforeSourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
177-
{{else}}
178-
<a class="item" rel="nofollow" href="{{$.SourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
179-
{{if and $.Repository.CanEnableEditor $.CanEditFile (not $file.IsLFSFile) (not $file.IsBin)}}
180-
<a class="item" rel="nofollow" href="{{$.HeadRepoLink}}/_edit/{{PathEscapeSegments $.HeadBranchName}}/{{PathEscapeSegments $file.Name}}?return_uri={{print $.BackToLink "#diff-" $file.NameHash | QueryEscape}}">{{ctx.Locale.Tr "repo.editor.edit_this_file"}}</a>
181-
{{end}}
167+
<button class="btn diff-header-popup-btn tw-mr-2">{{svg "octicon-kebab-horizontal" 18}}</button>
168+
<div class="tippy-target">
169+
{{if not (or $file.IsIncomplete $file.IsBin $file.IsSubmodule)}}
170+
<button class="unescape-button item" data-file-content-elem-id="diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</button>
171+
<button class="escape-button tw-hidden item" data-file-content-elem-id="diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
172+
{{end}}
173+
{{if and (not $file.IsSubmodule) (not $.PageIsWiki)}}
174+
{{if $file.IsDeleted}}
175+
<a class="item" rel="nofollow" href="{{$.BeforeSourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
176+
{{else}}
177+
<a class="item" rel="nofollow" href="{{$.SourcePath}}/{{PathEscapeSegments .Name}}">{{ctx.Locale.Tr "repo.diff.view_file"}}</a>
178+
{{if and $.Repository.CanEnableEditor $.CanEditFile (not $file.IsLFSFile) (not $file.IsBin)}}
179+
<a class="item" rel="nofollow" href="{{$.HeadRepoLink}}/_edit/{{PathEscapeSegments $.HeadBranchName}}/{{PathEscapeSegments $file.Name}}?return_uri={{print $.BackToLink "#diff-" $file.NameHash | QueryEscape}}">{{ctx.Locale.Tr "repo.editor.edit_this_file"}}</a>
182180
{{end}}
183181
{{end}}
184-
</div>
182+
{{end}}
185183
</div>
186184
</div>
187185
</h4>

‎web_src/css/modules/tippy.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@
7777
align-items: center;
7878
padding: 9px 18px;
7979
color: inherit;
80+
background: inherit;
8081
text-decoration: none;
8182
gap: 10px;
83+
width: 100%;
8284
}
8385

8486
.tippy-box[data-theme="menu"] .item:hover {

‎web_src/js/features/repo-diff.ts

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import $ from 'jquery';
2-
import {createTippy} from '../modules/tippy.ts';
32
import {initCompReactionSelector} from './comp/ReactionSelector.ts';
43
import {initRepoIssueContentHistory} from './repo-issue-content.ts';
54
import {initDiffFileTree, initDiffFileList} from './repo-diff-filetree.ts';
@@ -19,6 +18,7 @@ import {
1918
} from '../utils/dom.ts';
2019
import {POST, GET} from '../modules/fetch.ts';
2120
import {fomanticQuery} from '../modules/fomantic/base.ts';
21+
import {createTippy} from '../modules/tippy.ts';
2222

2323
const {pageData, i18n} = window.config;
2424

@@ -141,12 +141,22 @@ export function initRepoDiffConversationNav() {
141141
});
142142
}
143143

144+
function initDiffHeaderPopup() {
145+
for (const btn of document.querySelectorAll('.diff-header-popup-btn:not([data-header-popup-initialized])')) {
146+
btn.setAttribute('data-header-popup-initialized', '');
147+
const popup = btn.nextElementSibling;
148+
if (!popup?.matches('.tippy-target')) throw new Error('Popup element not found');
149+
createTippy(btn, {content: popup, theme: 'menu', placement: 'bottom', trigger: 'click', interactive: true, hideOnClick: true});
150+
}
151+
}
152+
144153
// Will be called when the show more (files) button has been pressed
145154
function onShowMoreFiles() {
146155
initRepoIssueContentHistory();
147156
initViewedCheckboxListenerFor();
148157
countAndUpdateViewedFiles();
149158
initImageDiff();
159+
initDiffHeaderPopup();
150160
}
151161

152162
export async function loadMoreFiles(url) {
@@ -222,27 +232,8 @@ export function initRepoDiffView() {
222232
initDiffFileList();
223233
initDiffCommitSelect();
224234
initRepoDiffShowMore();
235+
initDiffHeaderPopup();
225236
initRepoDiffFileViewToggle();
226237
initViewedCheckboxListenerFor();
227238
initExpandAndCollapseFilesButton();
228239
}
229-
230-
export function initRepoDiffFileMenu() {
231-
let tippyIndex = 0;
232-
$('.js-btn-diff-file-menu').each(function () {
233-
tippyIndex++;
234-
this.setAttribute('data-diff-file-menu-tippy-target-id', tippyIndex);
235-
const $menu = $(this).find('.tippy-target');
236-
if ($menu.length < 1) return;
237-
$menu[0].setAttribute('data-diff-file-menu-tippy-id', tippyIndex);
238-
createTippy(this, {
239-
content: $menu[0],
240-
role: 'menu',
241-
theme: 'menu',
242-
trigger: 'click',
243-
placement: 'bottom',
244-
interactive: true,
245-
hideOnClick: true,
246-
});
247-
});
248-
}

‎web_src/js/features/repo-unicode-escape.ts

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
import {hideElem, queryElemSiblings, showElem, toggleElem} from '../utils/dom.ts';
1+
import {addDelegatedEventListener, hideElem, queryElemSiblings, showElem, toggleElem} from '../utils/dom.ts';
22

33
export function initUnicodeEscapeButton() {
4-
document.addEventListener('click', (e) => {
5-
const btn = e.target.closest('.escape-button, .unescape-button, .toggle-escape-button');
6-
if (!btn) return;
7-
4+
addDelegatedEventListener(document, 'click', '.escape-button, .unescape-button, .toggle-escape-button', (btn, e) => {
85
e.preventDefault();
96

10-
let fileContent = btn.closest('.file-content, .non-diff-file-content');
11-
if (!fileContent) {
12-
const tippyTarget = btn.closest('.tippy-target');
13-
if (tippyTarget) {
14-
fileContent = document.querySelectorAll(`[data-diff-file-menu-tippy-target-id="${tippyTarget.getAttribute('data-diff-file-menu-tippy-id')}"]`)[0].closest('.file-content, .non-diff-file-content');
15-
}
16-
}
7+
const fileContentElemId = btn.getAttribute('data-file-content-elem-id');
8+
const fileContent = fileContentElemId ?
9+
document.querySelector(`#${fileContentElemId}`) :
10+
btn.closest('.file-content, .non-diff-file-content');
1711
const fileView = fileContent?.querySelectorAll('.file-code, .file-view');
18-
if (!fileView) return;
1912
if (btn.matches('.escape-button')) {
2013
for (const el of fileView) el.classList.add('unicode-escaped');
2114
hideElem(btn);

‎web_src/js/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {initSshKeyFormParser} from './features/sshkey-helper.ts';
4242
import {initUserSettings} from './features/user-settings.ts';
4343
import {initRepoActivityTopAuthorsChart, initRepoArchiveLinks} from './features/repo-common.ts';
4444
import {initRepoMigrationStatusChecker} from './features/repo-migrate.ts';
45-
import {initRepoDiffView, initRepoDiffFileMenu} from './features/repo-diff.ts';
45+
import {initRepoDiffView} from './features/repo-diff.ts';
4646
import {initOrgTeamSearchRepoBox, initOrgTeamSettings} from './features/org-team.ts';
4747
import {initUserAuthWebAuthn, initUserAuthWebAuthnRegister} from './features/user-auth-webauthn.ts';
4848
import {initRepoRelease, initRepoReleaseNew} from './features/repo-release.ts';
@@ -212,7 +212,6 @@ onDomReady(() => {
212212
initUserAuthWebAuthnRegister,
213213
initUserSettings,
214214
initRepoDiffView,
215-
initRepoDiffFileMenu,
216215
initPdfViewer,
217216
initScopedAccessTokenCategories,
218217
initColorPickers,

‎web_src/js/utils/dom.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import {debounce} from 'throttle-debounce';
22
import type {Promisable} from 'type-fest';
33
import type $ from 'jquery';
44

5-
type ElementArg = Element | string | NodeListOf<Element> | Array<Element> | ReturnType<typeof $>;
5+
type ArrayLikeIterable<T> = ArrayLike<T> & Iterable<T>; // for NodeListOf and Array
6+
type ElementArg = Element | string | ArrayLikeIterable<Element> | ReturnType<typeof $>;
67
type ElementsCallback<T extends Element> = (el: T) => Promisable<any>;
78
type ElementsCallbackWithArgs = (el: Element, ...args: any[]) => Promisable<any>;
8-
type ArrayLikeIterable<T> = ArrayLike<T> & Iterable<T>; // for NodeListOf and Array
99

1010
function elementsCall(el: ElementArg, func: ElementsCallbackWithArgs, ...args: any[]) {
1111
if (typeof el === 'string' || el instanceof String) {

0 commit comments

Comments
 (0)