gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-esm: Remove dynamic import to utils

Browse Source
This commit is contained in:
Elian Doran 2024-07-18 22:21:33 +03:00
parent 0c87fab550
commit a8fd3be133
No known key found for this signature in database
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/utils.ts
View File

@ -173,7 +173,7 @@ function replaceAll(string: string, replaceWhat: string, replaceWith: string) {
return string.replace(new RegExp(quotedReplaceWhat, "g"), replaceWith); return string.replace(new RegExp(quotedReplaceWhat, "g"), replaceWith);
} }
function formatDownloadTitle(fileName: string, type: string, mime: string) { function formatDownloadTitle(fileName: string, type: string | null, mime: string) {
if (!fileName) { if (!fileName) {
fileName = "untitled"; fileName = "untitled";
} }
@ -182,7 +182,7 @@ function formatDownloadTitle(fileName: string, type: string, mime: string) {
if (type === 'text') { if (type === 'text') {
return `${fileName}.html`; return `${fileName}.html`;
} else if (['relationMap', 'canvas', 'search'].includes(type)) { } else if (type && ['relationMap', 'canvas', 'search'].includes(type)) {
return `${fileName}.json`; return `${fileName}.json`;
} else { } else {
if (!mime) { if (!mime) {

3
src/share/routes.ts
View File

@ -15,6 +15,7 @@ import log from "../services/log.js";
import SNote from "./shaca/entities/snote.js"; import SNote from "./shaca/entities/snote.js";
import SBranch from "./shaca/entities/sbranch.js"; import SBranch from "./shaca/entities/sbranch.js";
import SAttachment from "./shaca/entities/sattachment.js"; import SAttachment from "./shaca/entities/sattachment.js";
import utils from "../services/utils.js";
function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } { function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) { if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
@ -317,8 +318,6 @@ function register(router: Router) {
addNoIndexHeader(attachment.note, res); addNoIndexHeader(attachment.note, res);
const utils = require('../services/utils');
const filename = utils.formatDownloadTitle(attachment.title, null, attachment.mime); const filename = utils.formatDownloadTitle(attachment.title, null, attachment.mime);
res.setHeader('Content-Disposition', utils.getContentDisposition(filename)); res.setHeader('Content-Disposition', utils.getContentDisposition(filename));