mirror of
https://github.com/zadam/trilium.git
synced 2025-03-01 14:22:32 +01:00
Merge remote-tracking branch 'origin/develop' into feature/investigate_tests
This commit is contained in:
commit
e89faf6786
@ -1,4 +1,4 @@
|
||||
const utils = require("./utils.js");
|
||||
import utils from "./utils.js";
|
||||
|
||||
function lex(str) {
|
||||
str = str.trim();
|
||||
@ -222,7 +222,7 @@ function lexAndParse(str, allowEmptyRelations = false) {
|
||||
return parse(tokens, str, allowEmptyRelations);
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
lex,
|
||||
parse,
|
||||
lexAndParse
|
||||
|
@ -505,7 +505,7 @@ function createImageSrcUrl(note) {
|
||||
return `api/images/${note.noteId}/${encodeURIComponent(note.title)}?timestamp=${Date.now()}`;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
export default {
|
||||
reloadFrontendApp,
|
||||
parseDate,
|
||||
formatDateISO,
|
||||
|
Loading…
x
Reference in New Issue
Block a user