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 export root note

Browse Source
This commit is contained in:
zadam 2020-09-19 22:47:14 +02:00
parent 07bd5129ca
commit 7ee50113d7
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,6 +276,10 @@ class TreeCache {
} }
async getBranchId(parentNoteId, childNoteId) { async getBranchId(parentNoteId, childNoteId) {
if (childNoteId === 'root') {
return 'root';
}
const child = await this.getNote(childNoteId); const child = await this.getNote(childNoteId);
if (!child) { if (!child) {

1
src/public/app/services/tree_context_menu.js
View File

@ -3,7 +3,6 @@ import treeCache from "./tree_cache.js";
import hoistedNoteService from './hoisted_note.js'; import hoistedNoteService from './hoisted_note.js';
import clipboard from './clipboard.js'; import clipboard from './clipboard.js';
import protectedSessionHolder from "./protected_session_holder.js"; import protectedSessionHolder from "./protected_session_holder.js";
import appContext from "./app_context.js";
import noteCreateService from "./note_create.js"; import noteCreateService from "./note_create.js";
import contextMenu from "./context_menu.js"; import contextMenu from "./context_menu.js";

6
src/public/app/services/ws.js
View File

@ -150,7 +150,7 @@ async function consumeSyncData() {
const nonProcessedSyncRows = allSyncRows.filter(sync => !processedEntityChangeIds.has(sync.id)); const nonProcessedSyncRows = allSyncRows.filter(sync => !processedEntityChangeIds.has(sync.id));
try { try {
await utils.timeLimit(processSyncRows(nonProcessedSyncRows), 5000); await utils.timeLimit(processSyncRows(nonProcessedSyncRows), 15000);
} }
catch (e) { catch (e) {
logError(`Encountered error ${e.message}: ${e.stack}, reloading frontend.`); logError(`Encountered error ${e.message}: ${e.stack}, reloading frontend.`);
@ -161,7 +161,9 @@ async function consumeSyncData() {
utils.reloadApp(); utils.reloadApp();
} }
else { else {
alert("Encountered error, check out the console."); console.log("nonProcessedSyncRows causing the timeout", nonProcessedSyncRows);
alert(`Encountered error "${e.message}", check out the console.`);
} }
} }