gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

if note doesn't exist we don't try to activate it

Browse Source
This commit is contained in:
azivner 2017-12-15 21:36:21 -05:00
parent 6edaf0ed00
commit df69dbb2e1
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/javascripts/messaging.js
View File

@ -5,7 +5,8 @@ const messaging = (function() {
let ws = null; let ws = null;
function logError(message) { function logError(message) {
console.trace(message); console.log(message); // needs to be separate from .trace()
console.trace();
if (ws && ws.readyState === 1) { if (ws && ws.readyState === 1) {
ws.send(JSON.stringify({ ws.send(JSON.stringify({

7
public/javascripts/note_tree.js
View File

@ -412,6 +412,13 @@ const noteTree = (function() {
setExpandedToServer(data.node.data.note_tree_id, false); setExpandedToServer(data.node.data.note_tree_id, false);
}, },
init: (event, data) => { init: (event, data) => {
const noteId = treeUtils.getNoteIdFromNotePath(startNotePath);
if (noteIdToTitle[noteId] === undefined) {
// note doesn't exist so don't try to activate it
startNotePath = null;
}
if (startNotePath) { if (startNotePath) {
activateNode(startNotePath); activateNode(startNotePath);
} }

2
services/sync.js
View File

@ -265,7 +265,7 @@ async function checkContentHash(syncContext) {
for (const key in hashes) { for (const key in hashes) {
if (hashes[key] !== resp.hashes[key]) { if (hashes[key] !== resp.hashes[key]) {
allChecksPassed = true; allChecksPassed = false;
await event_log.addEvent(`Content hash check for ${key} FAILED. Local is ${hashes[key]}, remote is ${resp.hashes[key]}`); await event_log.addEvent(`Content hash check for ${key} FAILED. Local is ${hashes[key]}, remote is ${resp.hashes[key]}`);