mirror of
https://github.com/leanote/desktop-app.git
synced 2025-10-17 08:38:18 +00:00
sync优化, 只有在content不一样的时候才认为conflict
This commit is contained in:
4
node_modules/api.js
generated
vendored
4
node_modules/api.js
generated
vendored
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user