Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-07 05:46:10 +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

5
src/public/javascripts/services/protected_session.js
View File

@@ -28,6 +28,7 @@ async function leaveProtectedSession() {
}
}
/** returned promise resolves with true if new protected session was established, false if no action was necessary */
function ensureProtectedSession(requireProtectedSession, modal) {
const dfd = $.Deferred();
@@ -53,7 +54,7 @@ function ensureProtectedSession(requireProtectedSession, modal) {
});
}
else {
dfd.resolve();
dfd.resolve(false);
}
return dfd.promise();
@@ -82,7 +83,7 @@ async function setupProtectedSession() {
$noteDetailWrapper.show();
protectedSessionDeferred.resolve();
protectedSessionDeferred.resolve(true);
protectedSessionDeferred = null;
$protectedSessionOnButton.addClass('active');