sync优化, 只有在content不一样的时候才认为conflict

This commit is contained in:
life
2015-11-15 21:54:37 +08:00
parent 9f5d5079f2
commit 6103601a2a
3 changed files with 87 additions and 77 deletions

4
node_modules/api.js generated vendored
View File

@@ -209,12 +209,8 @@ var Api = {
return callback && callback(false);
}
var ret = response.body;
log('--------')
log(ret);
if(Common.isOk(ret)) { // {Content: 'xx', NoteId: 'xxx'}
// Note.updateNoteContentForce(noteId, ret.Content, function() {
callback && callback(ret);
// });
} else {
callback && callback(false);
}