send changes, notebook.delete [ok]

node_modules/notebook.js

@@ -68,7 +68,7 @@ var Notebook = {
 	// 排序好之后返回
 	getNotebooks: function(callback) { 
 		var userId = User.getCurActiveUserId();
-		NB.find({UserId: userId}, function(err, notebooks) {
+		NB.find({UserId: userId, $or: [{LocalIsDelete : { $exists : false }}, {LocalIsDelete: false}] }, function(err, notebooks) {
 			if(err) {
 				log(err);
 				return callback && callback(false);
@@ -138,7 +138,14 @@ var Notebook = {
 
 	// 删除笔记本
 	deleteNotebook: function(notebookId, callback) {
-
+		NB.update({NotebookId: notebookId}, {$set: {LocalIsDelete: true, IsDirty: true, UpdatedTime: new Date()}}, function(err, n) {
+			callback(true);
+		});
+		/*
+		NB.remove({NotebookId: notebookId}, function(err, n) {
+			callback();
+		});
+		*/
 	},
 
 	// 重新统计笔记本的笔记数据
@@ -354,6 +361,15 @@ var Notebook = {
 
 		// 处理删除的
 		notebookWeb.deleteSync(notebookSyncInfo.deletes);
+	},
+
+	// 在send delete笔记时成功
+	setNotDirty: function(notebookId) {
+		NB.update({NotebookId: notebookId}, {$set:{IsDirty: false}})
+	},
+	// 在send delete笔记时有冲突
+	setNotDirtyNotDelete: function(notebookId) {
+		NB.update({NotebookId: notebookId}, {$set:{IsDirty: false, LocalIsDelete: false}})
 	}
 };
 module.exports = Notebook;