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

db setup fixes

Browse Source
This commit is contained in:
zadam 2020-03-26 16:59:40 +01:00
parent b778985b5e
commit 2e55d544f1
5 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/entities/note.js
View File

@ -95,15 +95,16 @@ class Note extends Entity {
this.content = "";
}
}
if (this.isStringNote()) {
this.content = this.content === null
? ""
: this.content.toString("UTF-8");
}
}
return this.content;
if (this.isStringNote()) {
return this.content === null
? ""
: this.content.toString("UTF-8");
}
else {
return this.content;
}
}
/** @returns {Promise<*>} */

15
src/entities/note_revision.js
View File

@ -89,15 +89,16 @@ class NoteRevision extends Entity {
this.content = "";
}
}
if (this.isStringNote()) {
this.content = this.content === null
? ""
: this.content.toString("UTF-8");
}
}
return this.content;
if (this.isStringNote()) {
return this.content === null
? ""
: this.content.toString("UTF-8");
}
else {
return this.content;
}
}
/** @returns {Promise} */

4
src/public/javascripts/services/utils.js
View File

@ -256,6 +256,10 @@ function openDialog($dialog) {
}
function isHtmlEmpty(html) {
if (!html) {
return true;
}
html = html.toLowerCase();
return $("<div>").html(html).text().trim().length === 0

2
src/routes/api/notes.js
View File

@ -15,7 +15,7 @@ async function getNote(req) {
}
if (note.isStringNote()) {
await note.getContent();
note.content = await note.getContent();
if (note.type === 'file') {
note.content = note.content.substr(0, 10000);

2
src/services/notes.js
View File

@ -668,7 +668,7 @@ async function scanForLinks(note) {
await note.setContent(newContent);
}
catch (e) {
log.error(`Could not scan for links note ${noteId}: ${e.message}`);
log.error(`Could not scan for links note ${note.noteId}: ${e.message} ${e.stack}`);
}
}