diff --git a/data/version b/data/version index 966e1b70..0362ea72 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -{"version":"0.9.1","updatedTime":"2015-11-15T07:21:51.505Z"} \ No newline at end of file +{"version":"0.9.2","updatedTime":"2015-11-20T07:21:51.505Z"} \ No newline at end of file diff --git a/node_modules/note.js b/node_modules/note.js index cc354b67..ae556288 100644 --- a/node_modules/note.js +++ b/node_modules/note.js @@ -590,6 +590,13 @@ var Note = { // 从服务器上获取内容 getNoteContentFromServer: function (serverNoteId, callback) { var me = this; + if (!serverNoteId) { + callback(false); + return; + } + if (!Api) { + Api = require('api'); + } Api.getNoteContent(serverNoteId, function(noteContent) { // 同步到本地 if(Common.isOk(noteContent)) { @@ -694,7 +701,7 @@ var Note = { console.error(doc.length + '. ..'); } console.log('note length: ' + doc.length + '. ..'); - if(err || !doc) { + if(err || !doc || !doc.length) { log('getNoteByServerNoteId 不存在' + noteId); callback && callback(false); } else { diff --git a/node_modules/sync.js b/node_modules/sync.js index e74b946f..6f6b2ebe 100644 --- a/node_modules/sync.js +++ b/node_modules/sync.js @@ -926,6 +926,10 @@ var Sync = { me._syncInfo.note.changeNeedAdds.push(note); cb(); } + // 防止其它原因导致失败 not image + else { + cb(); + } } // 更新失败了, 服务器返回异常 else {