leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-17 16:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync problems: 1. always sync, 2. sync error msg

Browse Source
This commit is contained in:
life
2018-12-03 12:17:24 +08:00
parent 7db8453464
commit f59feee321
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
node_modules/note.js generated vendored
View File

@@ -666,6 +666,9 @@ var Note = {
} }
*/ */
me.inSyncContent[noteId] = true; me.inSyncContent[noteId] = true;
if (!me.inSyncTimes[noteId]) {
me.inSyncTimes[noteId] = 0
}
me.inSyncTimes[noteId]++; me.inSyncTimes[noteId]++;
if(me.inSyncTimes[noteId] > 10) { if(me.inSyncTimes[noteId] > 10) {
callback && callback(false); callback && callback(false);
@@ -912,7 +915,6 @@ var Note = {
var everAttachsMap = {}; var everAttachsMap = {};
// var needAdds = []; // var needAdds = [];
// 得到要删除的 // 得到要删除的
var needDeletes = []; var needDeletes = [];
for(var i in everAttachs) { for(var i in everAttachs) {

2
public/js/app/note.js
View File

@@ -3700,7 +3700,7 @@ Note._getError = function(err, ret) {
var Err = {}; var Err = {};
try { try {
if (err && typeof err == 'object') { if (err && typeof err == 'object') {
Err.err = err.toString(); Err.err = JSON.stringify(err)
} }
} catch (e) {} } catch (e) {}
if (typeof ret == 'object' && 'Msg' in ret) { if (typeof ret == 'object' && 'Msg' in ret) {