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

fix: add import server to editable_text.js

Browse Source
This commit is contained in:
iamvann 2025-05-16 23:27:25 +08:00
parent d26e8758ca
commit 26f6c28c71
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/app/services/utils.js
View File

@ -81,23 +81,25 @@ function formatDateISO(date) {
// In utils.js // In utils.js
// import dayjs from 'dayjs'; // Assuming dayjs is available in this scope // import dayjs from 'dayjs'; // Assuming dayjs is available in this scope
// new version
function formatDateTime(date, userSuppliedFormat) { function formatDateTime(date, userSuppliedFormat) {
const DEFAULT_FORMAT = 'YYYY-MM-DD HH:mm'; let formatToUse;
let formatToUse = DEFAULT_FORMAT;
if (userSuppliedFormat && typeof userSuppliedFormat === 'string' && userSuppliedFormat.trim() !== "") { if (userSuppliedFormat && typeof userSuppliedFormat === 'string' && userSuppliedFormat.trim() !== "") {
formatToUse = userSuppliedFormat.trim(); formatToUse = userSuppliedFormat.trim();
} else {
formatToUse = 'YYYY-MM-DD HH:mm'; // Trilium's default format
} }
if (!date) { if (!date) {
date = new Date(); date = new Date();
} }
try { try {
return dayjs(date).format(formatToUse); return dayjs(date).format(formatToUse);
} catch (e) { } catch (e) {
console.warn(`Trilium: Day.js encountered an error with format string "${formatToUse}". Falling back to default. Error: ${e.message}`); console.warn(`Day.js: Invalid format string "${formatToUse}". Falling back. Error:`, e.message);
return dayjs(date).format(DEFAULT_FORMAT); return dayjs(date).format('YYYY-MM-DD HH:mm');
} }
} }

1
src/public/app/widgets/type_widgets/editable_text.js
View File

@ -9,6 +9,7 @@ import AbstractTextTypeWidget from "./abstract_text_type_widget.js";
import link from "../../services/link.js"; import link from "../../services/link.js";
import appContext from "../../components/app_context.js"; import appContext from "../../components/app_context.js";
import dialogService from "../../services/dialog.js"; import dialogService from "../../services/dialog.js";
import server from '../../services/server.js';
const ENABLE_INSPECTOR = false; const ENABLE_INSPECTOR = false;