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

Merge remote-tracking branch 'origin/develop' into feature/investigate_tests

Browse Source
This commit is contained in:
Elian Doran 2024-07-16 18:33:55 +03:00
commit e89faf6786
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/app/services/attribute_parser.js
View File

@ -1,4 +1,4 @@
const utils = require("./utils.js"); import utils from "./utils.js";
function lex(str) { function lex(str) {
str = str.trim(); str = str.trim();
@ -222,7 +222,7 @@ function lexAndParse(str, allowEmptyRelations = false) {
return parse(tokens, str, allowEmptyRelations); return parse(tokens, str, allowEmptyRelations);
} }
module.exports = { export default {
lex, lex,
parse, parse,
lexAndParse lexAndParse

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

@ -505,7 +505,7 @@ function createImageSrcUrl(note) {
return `api/images/${note.noteId}/${encodeURIComponent(note.title)}?timestamp=${Date.now()}`; return `api/images/${note.noteId}/${encodeURIComponent(note.title)}?timestamp=${Date.now()}`;
} }
module.exports = { export default {
reloadFrontendApp, reloadFrontendApp,
parseDate, parseDate,
formatDateISO, formatDateISO,