todo note send changes

This commit is contained in:
life
2015-01-26 00:37:29 +08:00
parent 7914aed51b
commit b65a997cc8
5 changed files with 274 additions and 36 deletions

17
node_modules/notebook.js generated vendored
View File

@@ -257,8 +257,11 @@ var Notebook = {
// 这里的notebook是服务器传过来的数据, 需要fix下,
updateNotebookForce: function(notebook, notebookLocal, callback) {
var me = this;
notebook.IsDirty = false;
notebook.LocalIsNew = false;
notebook.LocalIsDelete = false;
var serverNotebookId = notebook.NotebookId;
me.getNotebookIdByServerNotebookId(notebook.ParentNotebookId, function(parentNotebookId) {
notebook.ParentNotebookId = parentNotebookId;
@@ -344,15 +347,26 @@ var Notebook = {
callback && callback();
});
// 服务器没有, 但是是发送更新的, 所以需要作为添加
if(notebookSyncInfo.changeNeedAdds) {
var needAddNotebooks = notebookSyncInfo.changeNeedAdds;
for(var i in needAddNotebooks) {
var notebook = needAddNotebooks[i];
me.setIsNew(notebook.NotebookId);
}
}
// 处理添加的
var adds = notebookSyncInfo.adds;
log('has add...');
log(adds);
notebookWeb.addSync(adds);
log('has changeAdds')
log(notebookSyncInfo.changeAdds)
notebookWeb.addChange(notebookSyncInfo.changeAdds);
log('has updates...');
log(notebookSyncInfo);
log(notebookSyncInfo.updates);
@@ -370,6 +384,9 @@ var Notebook = {
// 在send delete笔记时有冲突
setNotDirtyNotDelete: function(notebookId) {
NB.update({NotebookId: notebookId}, {$set:{IsDirty: false, LocalIsDelete: false}})
},
setIsNew: function(notebookId) {
NB.update({NotebookId: notebookId}, {$set:{LocalIsNew: true, IsDirty: true}})
}
};
module.exports = Notebook;