mirror of
https://codeberg.org/davrot/forgejo.git
synced 2025-06-01 06:00:02 +02:00
Merge branch 'forgejo' into upload_with_path_structure
Some checks are pending
Integration tests for the release process / release-simulation (push) Waiting to run
Some checks are pending
Integration tests for the release process / release-simulation (push) Waiting to run
This commit is contained in:
commit
9dfa38225e
199 changed files with 4771 additions and 1806 deletions
|
@ -199,7 +199,7 @@ export function initAdminCommon() {
|
|||
}
|
||||
}
|
||||
|
||||
if (document.querySelector('.admin.authentication')) {
|
||||
if (document.querySelector('.admin.edit.authentication, .admin.new.authentication')) {
|
||||
const authNameEl = document.getElementById('auth_name');
|
||||
authNameEl.addEventListener('input', (el) => {
|
||||
// appSubUrl is either empty or is a path that starts with `/` and doesn't have a trailing slash.
|
||||
|
|
|
@ -151,7 +151,7 @@ class ComboMarkdownEditor {
|
|||
|
||||
setupTab() {
|
||||
const $container = $(this.container);
|
||||
const tabs = $container[0].querySelectorAll('.tabular.menu > .item');
|
||||
const tabs = $container[0].querySelectorAll('.switch > .item');
|
||||
|
||||
// Fomantic Tab requires the "data-tab" to be globally unique.
|
||||
// So here it uses our defined "data-tab-for" and "data-tab-panel" to generate the "data-tab" attribute for Fomantic.
|
||||
|
@ -159,12 +159,14 @@ class ComboMarkdownEditor {
|
|||
const tabPreviewer = Array.from(tabs).find((tab) => tab.getAttribute('data-tab-for') === 'markdown-previewer');
|
||||
tabEditor.setAttribute('data-tab', `markdown-writer-${elementIdCounter}`);
|
||||
tabPreviewer.setAttribute('data-tab', `markdown-previewer-${elementIdCounter}`);
|
||||
const toolbar = $container[0].querySelector('markdown-toolbar');
|
||||
const panelEditor = $container[0].querySelector('.ui.tab[data-tab-panel="markdown-writer"]');
|
||||
const panelPreviewer = $container[0].querySelector('.ui.tab[data-tab-panel="markdown-previewer"]');
|
||||
panelEditor.setAttribute('data-tab', `markdown-writer-${elementIdCounter}`);
|
||||
panelPreviewer.setAttribute('data-tab', `markdown-previewer-${elementIdCounter}`);
|
||||
|
||||
tabEditor.addEventListener('click', () => {
|
||||
toolbar.classList.remove('markdown-toolbar-hidden');
|
||||
requestAnimationFrame(() => {
|
||||
this.focus();
|
||||
});
|
||||
|
@ -177,6 +179,7 @@ class ComboMarkdownEditor {
|
|||
this.previewMode = this.options.previewMode ?? 'comment';
|
||||
this.previewWiki = this.options.previewWiki ?? false;
|
||||
tabPreviewer.addEventListener('click', async () => {
|
||||
toolbar.classList.add('markdown-toolbar-hidden');
|
||||
const formData = new FormData();
|
||||
formData.append('mode', this.previewMode);
|
||||
formData.append('context', this.previewContext);
|
||||
|
|
|
@ -58,7 +58,7 @@ export function initRepoCloneLink() {
|
|||
export function initRepoCommonBranchOrTagDropdown(selector) {
|
||||
$(selector).each(function () {
|
||||
const $dropdown = $(this);
|
||||
$dropdown.find('.reference.column').on('click', function () {
|
||||
$dropdown.find('.branch-tag-item').on('click', function () {
|
||||
hideElem($dropdown.find('.scrolling.reference-list-menu'));
|
||||
showElem($($(this).data('target')));
|
||||
return false;
|
||||
|
|
|
@ -72,7 +72,7 @@ export function initRepoCommentForm() {
|
|||
$selectBranch.find('.ui .branch-name').text(selectedValue);
|
||||
}
|
||||
});
|
||||
$selectBranch.find('.reference.column').on('click', function () {
|
||||
$selectBranch.find('.branch-tag-item').on('click', function () {
|
||||
hideElem($selectBranch.find('.scrolling.reference-list-menu'));
|
||||
$selectBranch.find('.reference .text').removeClass('black');
|
||||
showElem($($(this).data('target')));
|
||||
|
@ -469,7 +469,7 @@ async function onEditContent(event) {
|
|||
editContentZone.querySelector('button[data-button-name="cancel-edit"]').addEventListener('click', cancelAndReset);
|
||||
editContentZone.querySelector('button[data-button-name="save-edit"]').addEventListener('click', saveAndRefresh);
|
||||
} else {
|
||||
const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.tabular.menu > a[data-tab-for=markdown-writer]');
|
||||
const tabEditor = editContentZone.querySelector('.combo-markdown-editor').querySelector('.switch > a[data-tab-for=markdown-writer]');
|
||||
tabEditor?.click();
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue