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

decoupled protected session holder from presentation stuff and similar things

Browse Source
This commit is contained in:
azivner
2018-03-25 21:16:57 -04:00
parent 47eb1e3e02
commit ac1b06967f
12 changed files with 130 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/public/javascripts/dialogs/recent_notes.js
View File

@@ -1,6 +1,7 @@
import treeService from '../services/tree.js';
import messagingService from '../services/messaging.js';
import server from '../services/server.js';
import utils from "../services/utils";
const $dialog = $("#recent-notes-dialog");
const $searchInput = $('#recent-notes-search-input');
@@ -92,6 +93,14 @@ async function showDialog() {
setTimeout(reload, 100);
messagingService.subscribeToMessages(syncData => {
if (syncData.some(sync => sync.entityName === 'recent_notes')) {
console.log(utils.now(), "Reloading recent notes because of background changes");
reload();
}
});
export default {
showDialog,
addRecentNote,

6
src/public/javascripts/dialogs/settings.js
View File

@@ -1,6 +1,6 @@
"use strict";
import protectedSessionService from '../services/protected_session.js';
import protectedSessionHolder from '../services/protected_session_holder.js';
import utils from '../services/utils.js';
import server from '../services/server.js';
@@ -77,7 +77,7 @@ addModule((function() {
alert("Password has been changed. Trilium will be reloaded after you press OK.");
// password changed so current protected session is invalid and needs to be cleared
protectedSessionService.resetProtectedSession();
protectedSessionHolder.resetProtectedSession();
}
else {
utils.showError(result.message);
@@ -105,7 +105,7 @@ addModule((function() {
const protectedSessionTimeout = $protectedSessionTimeout.val();
settings.saveSettings(settingName, protectedSessionTimeout).then(() => {
protectedSessionService.setProtectedSessionTimeout(protectedSessionTimeout);
protectedSessionHolder.setProtectedSessionTimeout(protectedSessionTimeout);
});
return false;