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

fixed unloading the encrypted page after encryption timeout by simply reloading the app completely plus some unrelated refactorings

Browse Source
This commit is contained in:
azivner
2017-11-04 21:02:56 -04:00
parent 9c88fc6060
commit b192336113
6 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
public/javascripts/note_editor.js
View File

@@ -11,7 +11,6 @@ const noteEditor = (function() {
const encryptionPasswordEl = $("#encryption-password");
let currentNote = null;
let currentNoteLoadTime = null;
let noteChangeDisabled = false;
@@ -26,7 +25,7 @@ const noteEditor = (function() {
}
function getCurrentNoteLoadTime() {
return currentNoteLoadTime;
return currentNote ? currentNote.loadTime : null;
}
function noteChanged() {
@@ -100,9 +99,6 @@ const noteEditor = (function() {
message("Saved!");
}
currentNote = null;
currentNoteLoadTime = null;
function createNewTopLevelNote() {
let rootNode = treeEl.fancytree("getRootNode");
@@ -179,9 +175,7 @@ const noteEditor = (function() {
}
async function loadNoteToEditor(noteId) {
const note = await $.get(baseApiUrl + 'notes/' + noteId);
currentNote = note;
currentNoteLoadTime = Math.floor(new Date().getTime() / 1000);
currentNote = await $.get(baseApiUrl + 'notes/' + noteId);
if (newNoteCreated) {
newNoteCreated = false;
@@ -189,7 +183,7 @@ const noteEditor = (function() {
noteTitleEl.focus().select();
}
await encryption.ensureEncryptionIsAvailable(note.detail.encryption > 0, false);
await encryption.ensureEncryptionIsAvailable(currentNote.detail.encryption > 0, false);
noteDetailWrapperEl.show();
@@ -201,24 +195,24 @@ const noteEditor = (function() {
encryptionPasswordEl.val('');
encryption.decryptNoteIfNecessary(note);
encryption.decryptNoteIfNecessary(currentNote);
noteTitleEl.val(note.detail.note_title);
noteTitleEl.val(currentNote.detail.note_title);
noteChangeDisabled = true;
// Clear contents and remove all stored history. This is to prevent undo from going across notes
noteDetailEl.summernote('reset');
noteDetailEl.summernote('code', note.detail.note_text);
noteDetailEl.summernote('code', currentNote.detail.note_text);
document.location.hash = noteId;
recentNotes.addRecentNote(noteId, note.detail.note_id);
recentNotes.addRecentNote(noteId, currentNote.detail.note_id);
noteChangeDisabled = false;
setNoteBackgroundIfEncrypted(note);
setNoteBackgroundIfEncrypted(currentNote);
}
async function loadNote(noteId) {