Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 19:36:12 +01:00
Code Issues Packages Projects Releases Activity

fix for protected note freezing because of double initialization of CKEditor

Browse Source
This commit is contained in:
azivner
2018-08-28 15:03:23 +02:00
parent d31a136442
commit bc207d5e30
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/javascripts/services/note_detail.js
View File

@@ -132,7 +132,7 @@ function newNoteCreated() {
}
async function handleProtectedSession() {
await protectedSessionService.ensureProtectedSession(currentNote.isProtected, false);
const newSessionCreated = await protectedSessionService.ensureProtectedSession(currentNote.isProtected, false);
if (currentNote.isProtected) {
protectedSessionHolder.touchProtectedSession();
@@ -141,6 +141,8 @@ async function handleProtectedSession() {
// this might be important if we focused on protected note when not in protected note and we got a dialog
// to login, but we chose instead to come to another node - at that point the dialog is still visible and this will close it.
protectedSessionService.ensureDialogIsClosed();
return newSessionCreated;
}
async function loadNoteDetail(noteId) {
@@ -168,7 +170,11 @@ async function loadNoteDetail(noteId) {
$noteDetailComponents.hide();
await handleProtectedSession();
const newSessionCreated = await handleProtectedSession();
if (newSessionCreated) {
// in such case we're reloading note anyway so no need to continue here.
return;
}
await getComponent(currentNote.type).show();
}