send changes, notebook.delete [ok]

node_modules/api.js

@@ -284,18 +284,36 @@ var Api = {
 	},
 
 	// 删除
-	deleteNotebook: function(serverNotebookId, callback) {
+	deleteNotebook: function(notebook, callback) {
 		var me = this;
-		var data = {notebookId: serverNotebookId};
+		var data = {notebookId: notebook.ServerNotebookId, usn: notebook.Usn};
+		log('delete notebook');
 		needle.post(me.getUrl('notebook/deleteNotebook'), data, {}, function(err, resp) {
 			if(err) {
 				return callback(false);
 			}
 			var ret = resp.body;
+			log('delete notebook ret');
+			log(ret);
 			if(Common.isOk(ret)) {
+				// 以后不要再发了
+				Notebook.setNotDirty(notebook.NotebookId);
 				callback(ret);
 			} else {
 				callback(false);
+				try {
+					log('delete notebook conflict');
+					// 代表冲突了, 那么本地的删除无效, 设为IsDirty为false, 不删除
+					// 待以后同步
+					if(ret.Msg == 'conflict') {
+						log('delete notebook conflict: setNotDirtyNotDelete');
+						Notebook.setNotDirtyNotDelete(notebook.NotebookId);
+					} else {
+						log('delete notebook conflict: setNotDirty');
+						Notebook.setNotDirty(notebook.NotebookId);
+					}
+
+				} catch(e) {}
 			}
 		});
 	}