mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-17 10:13:37 +02:00
Merge branch 'main' into lunny/remove_unnecessary_funcs
This commit is contained in:
commit
2f85c44761
@ -1,6 +1,6 @@
|
|||||||
import {colord} from 'colord';
|
import {colord} from 'colord';
|
||||||
import {basename, extname, isObject, isDarkTheme} from '../utils.ts';
|
import {basename, extname, isObject, isDarkTheme} from '../utils.ts';
|
||||||
import {onInputDebounce} from '../utils/dom.ts';
|
import {onInputDebounce, toggleElem} from '../utils/dom.ts';
|
||||||
import type MonacoNamespace from 'monaco-editor';
|
import type MonacoNamespace from 'monaco-editor';
|
||||||
|
|
||||||
type Monaco = typeof MonacoNamespace;
|
type Monaco = typeof MonacoNamespace;
|
||||||
@ -197,19 +197,19 @@ function getFileBasedOptions(filename: string, lineWrapExts: string[]): MonacoOp
|
|||||||
}
|
}
|
||||||
|
|
||||||
function togglePreviewDisplay(previewable: boolean): void {
|
function togglePreviewDisplay(previewable: boolean): void {
|
||||||
|
// FIXME: here and below, the selector is too broad, it should only query in the editor related scope
|
||||||
const previewTab = document.querySelector<HTMLElement>('a[data-tab="preview"]');
|
const previewTab = document.querySelector<HTMLElement>('a[data-tab="preview"]');
|
||||||
|
// the "preview tab" exists for "file code editor", but doesn't exist for "git hook editor"
|
||||||
if (!previewTab) return;
|
if (!previewTab) return;
|
||||||
|
|
||||||
if (previewable) {
|
toggleElem(previewTab, previewable);
|
||||||
previewTab.style.display = '';
|
if (previewable) return;
|
||||||
} else {
|
|
||||||
previewTab.style.display = 'none';
|
// If not previewable but the "preview" tab was active (user changes the filename to a non-previewable one),
|
||||||
// If the "preview" tab was active, user changes the filename to a non-previewable one,
|
// then the "preview" tab becomes inactive (hidden), so the "write" tab should become active
|
||||||
// then the "preview" tab becomes inactive (hidden), so the "write" tab should become active
|
if (previewTab.classList.contains('active')) {
|
||||||
if (previewTab.classList.contains('active')) {
|
const writeTab = document.querySelector<HTMLElement>('a[data-tab="write"]');
|
||||||
const writeTab = document.querySelector<HTMLElement>('a[data-tab="write"]');
|
writeTab?.click(); // TODO: it shouldn't need null-safe operator, writeTab must exist
|
||||||
writeTab?.click();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@ export function initRepositoryActionView() {
|
|||||||
// TODO: the parent element's full height doesn't work well now,
|
// TODO: the parent element's full height doesn't work well now,
|
||||||
// but we can not pollute the global style at the moment, only fix the height problem for pages with this component
|
// but we can not pollute the global style at the moment, only fix the height problem for pages with this component
|
||||||
const parentFullHeight = document.querySelector<HTMLElement>('body > div.full.height');
|
const parentFullHeight = document.querySelector<HTMLElement>('body > div.full.height');
|
||||||
if (parentFullHeight) parentFullHeight.style.paddingBottom = '0';
|
if (parentFullHeight) parentFullHeight.classList.add('tw-pb-0');
|
||||||
|
|
||||||
const view = createApp(RepoActionView, {
|
const view = createApp(RepoActionView, {
|
||||||
runIndex: el.getAttribute('data-run-index'),
|
runIndex: el.getAttribute('data-run-index'),
|
||||||
|
|||||||
@ -113,8 +113,8 @@ export function initRepoEditor() {
|
|||||||
warningDiv = document.createElement('div');
|
warningDiv = document.createElement('div');
|
||||||
warningDiv.classList.add('ui', 'warning', 'message', 'flash-message', 'flash-warning', 'space-related');
|
warningDiv.classList.add('ui', 'warning', 'message', 'flash-message', 'flash-warning', 'space-related');
|
||||||
warningDiv.innerHTML = html`<p>File path contains leading or trailing whitespace.</p>`;
|
warningDiv.innerHTML = html`<p>File path contains leading or trailing whitespace.</p>`;
|
||||||
// Add display 'block' because display is set to 'none' in formantic\build\semantic.css
|
// Change to `block` display because it is set to 'none' in fomantic/build/semantic.css
|
||||||
warningDiv.style.display = 'block';
|
warningDiv.classList.add('tw-block');
|
||||||
const inputContainer = document.querySelector('.repo-editor-header')!;
|
const inputContainer = document.querySelector('.repo-editor-header')!;
|
||||||
inputContainer.insertAdjacentElement('beforebegin', warningDiv);
|
inputContainer.insertAdjacentElement('beforebegin', warningDiv);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user