leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-15 23:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

僵尸note

Browse Source 
https://github.com/leanote/desktop-app/issues/67
This commit is contained in:
life
2015-10-19 18:50:46 +08:00
parent c7ae984427
commit 3752a0f8e2
2 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
node_modules/note.js generated vendored
View File

@@ -342,12 +342,13 @@ var Note = {
note.IsDirty = true;
// TODO 删除附件
db.notes.update({_id: note._id}, {$set: {IsDirty: true, LocalIsDelete: true}}, function(err, n) {
if(n) {
// 如果有tags, 则重新更新tags' count
me.updateTagCount(note.Tags);
callback(true);
}
callback(false);
});
} else {
callback(false);
@@ -1085,7 +1086,7 @@ var Note = {
// TODO, 这里, 如果内容是一样的, 则以服务器上的版为准
console.error('是否真的冲突');
// console.error('是否真的冲突');
var serverNote = serverAndLocalNote.server; // noteId没有转换的
var localNote = serverAndLocalNote.local; // 本地的note
@@ -1100,7 +1101,7 @@ var Note = {
// 没有冲突, 好, 用服务器端的其它值
if(serverContent == localNote.Content) {
console.error(localNote.Title + ' 无冲突');
// console.error(localNote.Title + ' 无冲突');
// console.log(serverNote);
delete serverNote['Content'];
delete serverNote['Abstract'];
@@ -1140,8 +1141,8 @@ var Note = {
callback && callback();
// 因为在处理冲突的时候有些成为更新了, 所以必须在此之后调用
console.log('has updates...');
console.log(noteSyncInfo.updates);
// console.log('has updates...');
// console.log(noteSyncInfo.updates);
// 处理更新的
Web.updateSyncNote(noteSyncInfo.updates);
});
@@ -1150,8 +1151,8 @@ var Note = {
// 复制一份
// 发送改变的冲突, 有这种情况发生吗?
var changeConflicts = noteSyncInfo.changeConflicts;
console.log('changeConflicts');
console.log(changeConflicts);
// console.log('changeConflicts');
// console.log(changeConflicts);
for(var i in changeConflicts) {
(function(i) {
@@ -1167,9 +1168,9 @@ var Note = {
Api.getNote(note.ServerNoteId, function(serverNote) {
serverNote.ServerNoteId = serverNote.NoteId;
serverNote.NoteId = note.NoteId;
console.error("changeConflicts -> get note from server");
console.log(serverNote);
console.log(note);
// console.error("changeConflicts -> get note from server");
// console.log(serverNote);
// console.log(note);
me.updateNoteForceForConflict(serverNote, function(note2) {
if(!note2) {
// 前端来处理, 全量sync时不用前端一个个处理
@@ -1208,7 +1209,6 @@ var Note = {
var changeUpdates = noteSyncInfo.changeUpdates || [];
changeAdds = changeAdds.concat(changeUpdates);
Web.updateNoteCacheForServer(changeAdds);
},
// 得到所有文件要传的基本信息和传送的数据