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

more complete support for network-less electron frontend-backend communication including protected session

Browse Source
This commit is contained in:
azivner
2017-11-29 23:30:35 -05:00
parent 8bd76721ad
commit d0a0366b05
7 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/javascripts/protected_session.js
View File

@@ -10,8 +10,8 @@ const protected_session = (function() {
let protectedSessionTimeout = null;
let protectedSessionId = null;
server.get('settings/all').then(settings => {
protectedSessionTimeout = settings.protected_session_timeout;
$(document).ready(() => {
server.get('settings/all').then(settings => protectedSessionTimeout = settings.protected_session_timeout);
});
function setProtectedSessionTimeout(encSessTimeout) {
@@ -57,7 +57,6 @@ const protected_session = (function() {
}
protectedSessionId = response.protectedSessionId;
server.initAjax();
dialogEl.dialog("close");
@@ -96,11 +95,9 @@ const protected_session = (function() {
function resetProtectedSession() {
protectedSessionId = null;
server.initAjax();
// most secure solution - guarantees nothing remained in memory
// since this expires because user doesn't use the app, it shouldn't be disruptive
window.location.reload(true);
reloadApp();
}
function isProtectedSessionAvailable() {