<- sync notebook.udpate[ok]

This commit is contained in:
life
2015-01-25 22:21:42 +08:00
parent 72232dc86e
commit f4d0ce223e
3 changed files with 42 additions and 32 deletions

2
node_modules/sync.js generated vendored
View File

@@ -151,7 +151,7 @@ var Sync = {
} else {
}
// 这里都是用服务器端的数据, 不处理冲突
Notebook.updateNotebookForce(notebook, function(notebook) {
Notebook.updateNotebookForce(notebook, notebookLocal, function(notebook) {
if(notebook) {
me._syncInfo.notebook.updates.push(notebook);
}