Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

encryption settings loading moved from tree to encryption module

Browse Source
This commit is contained in:
azivner
2017-11-04 19:57:40 -04:00
parent dfaa59b0a9
commit 9c88fc6060
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/javascripts/note_tree.js
View File

@@ -6,8 +6,6 @@ const noteTree = (function() {
let treeLoadTime = null;
let clipboardNoteId = null;
glob.allNoteIds = [];
function getTreeLoadTime() {
return treeLoadTime;
}
@@ -194,9 +192,6 @@ const noteTree = (function() {
return $.get(baseApiUrl + 'tree').then(resp => {
const notes = resp.notes;
let startNoteId = resp.start_note_id;
encryption.setEncryptionSalt(resp.password_derived_key_salt);
encryption.setEncryptionSessionTimeout(resp.encryption_session_timeout);
encryption.setEncryptedDataKey(resp.encrypted_data_key);
treeLoadTime = resp.tree_load_time;
// add browser ID header to all AJAX requests