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

change notebook status: dirty, new

Browse Source
This commit is contained in:
life
2017-01-19 14:38:18 +08:00
parent b82afa1d24
commit 8472adfe59
7 changed files with 155 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
node_modules/sync.js generated vendored
View File

@@ -32,7 +32,7 @@ syncProgress 设置
var Sync = {
// 同步的信息, 返回给调用者
_syncInfo: {
notebook: {changeAdds: [], changeConflicts: [], adds: [], deletes: [], updates: []},
notebook: {changeAdds: [], changeConflicts: [], adds: [], deletes: [], updates: [], changeUpdates: []},
note: {changeAdds: [], changeConflicts: [], adds: [], deletes: [], updates: [], conflicts: [], errors: []},
tag: {}
},
@@ -84,7 +84,7 @@ var Sync = {
// 同步信息
me._syncInfo = {
notebook: {ok: false, changeAdds: [], changeConflicts: [], changeNeedAdds: [], adds: [], deletes: [], updates: []},
notebook: {ok: false, changeAdds: [], changeConflicts: [], changeNeedAdds: [], adds: [], deletes: [], updates: [], changeUpdates: []},
note: {ok: false, adds: [], changeAdds: [], changeConflicts: [], changeUpdates:[], changeNeedAdds: [], deletes: [], updates: [], conflicts: [], errors: []},
tag: {ok: false, adds: [], changeAdds: [], changeConflicts: [], changeNeedAdds: [], deletes: [], updates: [], conflicts: []},
};
@@ -884,8 +884,8 @@ var Sync = {
} else if(newNotebook.Msg == 'notExists') {
// 服务器端没有, 那么要作为添加
// 可能服务器上已删除, 此时应该要作为添加而不是更新
me._syncInfo.notebook.changeNeedAdds.push(notebook);
// me.fixSynced('notebook', 'changeNeedAdds', notebook);
// me._syncInfo.notebook.changeNeedAdds.push(notebook);
me.fixSynced('notebook', 'changeNeedAdds', notebook);
}
// me.checkNeedIncSyncAgain(newNotebook.Usn);
@@ -894,17 +894,15 @@ var Sync = {
else {
// 更新
// TODO 后端updateNotebook只要传Usn回来即可
console.log(" 返回来的notebook" + newNotebook.Title)
console.log(" 返回来的notebook " + newNotebook.Title)
Notebook.updateNotebookForceForSendChange(notebook.NotebookId, newNotebook, function() {
if(notebook.LocalIsNew) {
// 没用
me._syncInfo.notebook.changeAdds.push(newNotebook);
// me.fixSynced('notebook', 'changeAdds', newNotebook);
// me._syncInfo.notebook.changeAdds.push(newNotebook);
me.fixSynced('notebook', 'changeAdds', newNotebook);
} else {
// 没用
// me._syncInfo.notebook.updates.push(newNotebook);
me.fixSynced('notebook', 'updates', newNotebook);
// me._syncInfo.notebook.changeUpdates.push(newNotebook);
me.fixSynced('notebook', 'changeUpdates', newNotebook);
}
// 这里才cb(), 因为先添加父, 再添加子