Skip to content

Commit 757d37d

Browse files
committed
fix
1 parent 22bf2ca commit 757d37d

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

templates/repo/diff/box.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
<button class="btn diff-header-popup-btn tw-p-1">{{svg "octicon-kebab-horizontal" 18}}</button>
168168
<div class="tippy-target">
169169
{{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>
170+
<button class="unescape-button item" data-unicode-content-selector="#diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</button>
171+
<button class="escape-button tw-hidden item" data-unicode-content-selector="#diff-{{$file.NameHash}}">{{ctx.Locale.Tr "repo.escape_control_characters"}}</button>
172172
{{end}}
173173
{{if and (not $file.IsSubmodule) (not $.PageIsWiki)}}
174174
{{if $file.IsDeleted}}

templates/repo/wiki/view.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
</div>
4545
<div class="repo-button-row">
4646
{{if .EscapeStatus.Escaped}}
47-
<a class="ui small button unescape-button tw-m-0 tw-hidden">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</a>
48-
<a class="ui small button escape-button tw-m-0">{{ctx.Locale.Tr "repo.escape_control_characters"}}</a>
47+
<a class="ui small button unescape-button tw-hidden" data-unicode-content-selector=".wiki-content-parts">{{ctx.Locale.Tr "repo.unescape_control_characters"}}</a>
48+
<a class="ui small button escape-button" data-unicode-content-selector=".wiki-content-parts">{{ctx.Locale.Tr "repo.escape_control_characters"}}</a>
4949
{{end}}
5050
{{if and .CanWriteWiki (not .Repository.IsMirror)}}
5151
<a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}?action=_edit">{{ctx.Locale.Tr "repo.wiki.edit_page_button"}}</a>
5252
<a class="ui small primary button" href="{{.RepoLink}}/wiki?action=_new">{{ctx.Locale.Tr "repo.wiki.new_page_button"}}</a>
53-
<a class="ui small red button tw-m-0 delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
53+
<a class="ui small red button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}?action=_delete" data-id="{{.PageURL}}">{{ctx.Locale.Tr "repo.wiki.delete_page_button"}}</a>
5454
{{end}}
5555
</div>
5656
</div>
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
import {addDelegatedEventListener, hideElem, queryElemSiblings, showElem, toggleElem} from '../utils/dom.ts';
22

33
export function initUnicodeEscapeButton() {
4+
// buttons might appear on these pages: file view (code view), diff, blame, rendered content (markdown, etc.)
45
addDelegatedEventListener(document, 'click', '.escape-button, .unescape-button, .toggle-escape-button', (btn, e) => {
56
e.preventDefault();
67

7-
const fileContentElemId = btn.getAttribute('data-file-content-elem-id');
8-
const fileContent = fileContentElemId ?
9-
document.querySelector(`#${fileContentElemId}`) :
8+
const unicodeContentSelector = btn.getAttribute('data-unicode-content-selector');
9+
const container = unicodeContentSelector ?
10+
document.querySelector(unicodeContentSelector) :
1011
btn.closest('.file-content, .non-diff-file-content');
11-
const fileView = fileContent?.querySelectorAll('.file-code, .file-view');
12+
const fileView = container.querySelector('.file-code, .file-view') || container;
1213
if (btn.matches('.escape-button')) {
13-
for (const el of fileView) el.classList.add('unicode-escaped');
14+
fileView.classList.add('unicode-escaped');
1415
hideElem(btn);
1516
showElem(queryElemSiblings(btn, '.unescape-button'));
1617
} else if (btn.matches('.unescape-button')) {
17-
for (const el of fileView) el.classList.remove('unicode-escaped');
18+
fileView.classList.remove('unicode-escaped');
1819
hideElem(btn);
1920
showElem(queryElemSiblings(btn, '.escape-button'));
2021
} else if (btn.matches('.toggle-escape-button')) {
21-
const isEscaped = fileView[0]?.classList.contains('unicode-escaped');
22-
for (const el of fileView) el.classList.toggle('unicode-escaped', !isEscaped);
23-
toggleElem(fileContent.querySelectorAll('.unescape-button'), !isEscaped);
24-
toggleElem(fileContent.querySelectorAll('.escape-button'), isEscaped);
22+
const isEscaped = fileView.classList.contains('unicode-escaped');
23+
fileView.classList.toggle('unicode-escaped', !isEscaped);
24+
toggleElem(container.querySelectorAll('.unescape-button'), !isEscaped);
25+
toggleElem(container.querySelectorAll('.escape-button'), isEscaped);
2526
}
2627
});
2728
}

0 commit comments

Comments
 (0)