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

hiding protected session dialog when moving over to unprotected note

Browse Source
This commit is contained in:
azivner
2017-11-15 00:10:11 -05:00
parent 9cf935efd1
commit dd5a142fdd
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/javascripts/protected_session.js
View File

@@ -69,13 +69,7 @@ const protected_session = (function() {
noteTree.reload();
if (protectedSessionDeferred !== null) {
// this may fal if the dialog has not been previously opened
try {
dialogEl.dialog('close');
}
catch(e) {}
passwordEl.val('');
ensureDialogIsClosed(dialogEl, passwordEl);
protectedSessionDeferred.resolve();
@@ -83,6 +77,16 @@ const protected_session = (function() {
}
}
function ensureDialogIsClosed() {
// this may fal if the dialog has not been previously opened
try {
dialogEl.dialog('close');
}
catch (e) {}
passwordEl.val('');
}
async function enterProtectedSession(password) {
return await $.ajax({
url: baseApiUrl + 'login/protected',
@@ -182,6 +186,7 @@ const protected_session = (function() {
unprotectNoteAndSendToServer,
getProtectedSessionId,
touchProtectedSession,
protectSubTree
protectSubTree,
ensureDialogIsClosed
};
})();