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

more fine grained handling of conflicts without having to reload whole page most of the time

Browse Source
This commit is contained in:
azivner
2017-11-01 22:36:26 -04:00
parent 962c078bbc
commit 1cf247f164
7 changed files with 172 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/note.js
View File

@@ -113,6 +113,7 @@ function saveNoteToServer(note, callback) {
}
let globalCurrentNote;
let globalCurrentNoteLoadTime;
function createNewTopLevelNote() {
let rootNode = globalTree.fancytree("getRootNode");
@@ -193,6 +194,7 @@ function setNoteBackgroundIfEncrypted(note) {
function loadNoteToEditor(noteId) {
$.get(baseApiUrl + 'notes/' + noteId).then(note => {
globalCurrentNote = note;
globalCurrentNoteLoadTime = Math.floor(new Date().getTime() / 1000);
if (newNoteCreated) {
newNoteCreated = false;