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

don't alert in case of updated note in current editor

Browse Source
This commit is contained in:
azivner
2017-11-03 20:50:48 -04:00
parent 702d47e6b0
commit cf45594d89
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/javascripts/status.js
View File

@@ -13,14 +13,11 @@ function checkStatus() {
loadTree().then(resp => {
console.log("Reloading tree because of background changes");
// this will also reload the note content
globalTree.fancytree('getTree').reload(resp.notes);
});
}
if (resp.changedCurrentNote) {
alert("Current note has been changed in different window / computer. Please reload the application and resolve the conflict manually.");
}
$("#changesToPushCount").html(resp.changesToPushCount);
},
statusCode: {