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

fix a bug where render note content could be set to null during renaming

Browse Source
This commit is contained in:
zadam 2019-10-21 22:56:43 +02:00
parent 41d47c5d33
commit 3de124748d
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build.sh
View File

@ -2,7 +2,7 @@
echo "Deleting existing builds" echo "Deleting existing builds"
rm -r dist/* rm -rf dist/*
SRC_DIR=dist/trilium-src SRC_DIR=dist/trilium-src

12
libraries/jsplumb.js
View File

File diff suppressed because one or more lines are too long

2
src/public/javascripts/services/ws.js
View File

@ -82,8 +82,6 @@ async function handleMessage(event) {
let syncIdReachedListeners = []; let syncIdReachedListeners = [];
function waitForSyncId(desiredSyncId) { function waitForSyncId(desiredSyncId) {
console.log("Waiting for ", desiredSyncId);
if (desiredSyncId <= lastSyncId) { if (desiredSyncId <= lastSyncId) {
return Promise.resolve(); return Promise.resolve();
} }

2
src/services/notes.js
View File

@ -370,7 +370,7 @@ async function updateNote(noteId, noteUpdates) {
note.isProtected = noteUpdates.isProtected; note.isProtected = noteUpdates.isProtected;
await note.save(); await note.save();
if (!['file', 'image'].includes(note.type)) { if (!['file', 'image', 'render'].includes(note.type)) {
noteUpdates.content = await saveLinks(note, noteUpdates.content); noteUpdates.content = await saveLinks(note, noteUpdates.content);
await note.setContent(noteUpdates.content); await note.setContent(noteUpdates.content);