gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-03 22:14:24 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fix(markdown): show 'import successful' when canceling markdown import (#7899)
Some checks failed
Checks / main (push) Waiting to run
Details
CodeQL Advanced / Analyze (actions) (push) Waiting to run
Details
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Details
Dev / Test development (push) Waiting to run
Details
Dev / Build Docker image (push) Blocked by required conditions
Details
Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
Details
Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
Details
/ Check Docker build (Dockerfile) (push) Waiting to run
Details
/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
Details
/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
Details
/ Merge manifest lists (push) Blocked by required conditions
Details
playwright / E2E tests on linux-arm64 (push) Waiting to run
Details
playwright / E2E tests on linux-x64 (push) Waiting to run
Details
Deploy Documentation / Build and Deploy Documentation (push) Has been cancelled
Details
Deploy website / Build & deploy website (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Elian Doran 2025-12-02 12:11:25 +00:00 committed by GitHub
commit a867a25d5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/client/src/widgets/dialogs/markdown_import.tsx
View File

@ -34,15 +34,26 @@ export default function MarkdownImportDialog() {
} }
}); });
function submit() {
setShown(false);
if (editorApiRef.current && text) {
convertMarkdownToHtml(text, editorApiRef.current);
}
}
return ( return (
<Modal <Modal
className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg" className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg"
footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={() => setShown(false)} keyboardShortcut="Ctrl+Enter" />} footer={
<Button
className="markdown-import-button"
text={t("markdown_import.import_button")}
keyboardShortcut="Ctrl+Enter"
onClick={submit}
/>
}
onShown={() => markdownImportTextArea.current?.focus()} onShown={() => markdownImportTextArea.current?.focus()}
onHidden={async () => { onHidden={() => {
if (editorApiRef.current) {
await convertMarkdownToHtml(text, editorApiRef.current);
}
setShown(false); setShown(false);
setText(""); setText("");
}} }}
@ -55,7 +66,7 @@ export default function MarkdownImportDialog() {
onKeyDown={(e) => { onKeyDown={(e) => {
if (e.key === "Enter" && e.ctrlKey) { if (e.key === "Enter" && e.ctrlKey) {
e.preventDefault(); e.preventDefault();
setShown(false); submit();
} }
}}></textarea> }}></textarea>
</Modal> </Modal>