From f59feee32169c47c54f710cf8f2da3e9bc5e5c6c Mon Sep 17 00:00:00 2001 From: life Date: Mon, 3 Dec 2018 12:17:24 +0800 Subject: [PATCH] sync problems: 1. always sync, 2. sync error msg --- node_modules/note.js | 4 +++- public/js/app/note.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/node_modules/note.js b/node_modules/note.js index edd278fd..11c783ad 100644 --- a/node_modules/note.js +++ b/node_modules/note.js @@ -666,6 +666,9 @@ var Note = { } */ me.inSyncContent[noteId] = true; + if (!me.inSyncTimes[noteId]) { + me.inSyncTimes[noteId] = 0 + } me.inSyncTimes[noteId]++; if(me.inSyncTimes[noteId] > 10) { callback && callback(false); @@ -912,7 +915,6 @@ var Note = { var everAttachsMap = {}; // var needAdds = []; - // 得到要删除的 var needDeletes = []; for(var i in everAttachs) { diff --git a/public/js/app/note.js b/public/js/app/note.js index 49f1ad42..4fe52d87 100644 --- a/public/js/app/note.js +++ b/public/js/app/note.js @@ -3700,7 +3700,7 @@ Note._getError = function(err, ret) { var Err = {}; try { if (err && typeof err == 'object') { - Err.err = err.toString(); + Err.err = JSON.stringify(err) } } catch (e) {} if (typeof ret == 'object' && 'Msg' in ret) {