diff --git a/node_modules/api.js b/node_modules/api.js index 826f5556..0598d64d 100644 --- a/node_modules/api.js +++ b/node_modules/api.js @@ -257,17 +257,23 @@ var Api = { var me = this; Notebook.getServerNotebookIdByNotebookId(notebook.ParentNotebookId, function(serverNotebookId) { var data = { - NotebookId: notebook.ServerNotebookId, - Title: notebook.Title, - Usn: notebook.Title, - Seq: notebook.Seq, - ParentNotebookId: serverNotebookId + notebookId: notebook.ServerNotebookId, + title: notebook.Title, + usn: notebook.Usn, + seq: notebook.Seq, + parentNotebookId: serverNotebookId || "" } + log('update notebook'); + log(data); needle.post(me.getUrl('notebook/updateNotebook'), data, {}, function(err, resp) { if(err) { + log('err'); + log(err); return callback(false); } var ret = resp.body; + log('update notebook ret:'); + log(ret); if(Common.isOk(ret)) { callback(ret); } else { @@ -280,7 +286,7 @@ var Api = { // 删除 deleteNotebook: function(serverNotebookId, callback) { var me = this; - var data = {NotebookId: serverNotebookId}; + var data = {notebookId: serverNotebookId}; needle.post(me.getUrl('notebook/deleteNotebook'), data, {}, function(err, resp) { if(err) { return callback(false); diff --git a/node_modules/notebook.js b/node_modules/notebook.js index 097f0bfe..adc647f4 100644 --- a/node_modules/notebook.js +++ b/node_modules/notebook.js @@ -125,6 +125,12 @@ var Notebook = { }); }, + updateNotebookTitle: function(notebookId, title, callback) { + NB.update({NotebookId: notebookId}, {$set: {Title: title, IsDirty: true, UpdatedTime: new Date()}}, function(err, n) { + callback(true); + }); + }, + // 修改笔记本 updateNotebook: function(notebookId, callback) { @@ -193,7 +199,7 @@ var Notebook = { }, // 发送changes时用 api调用 getServerNotebookIdByNotebookId: function(notebookId, callback) { - if(!serverNotebookId) { + if(!notebookId) { return callback(false); } NB.findOne({NotebookId: notebookId}, function(err, notebook) { @@ -267,6 +273,7 @@ var Notebook = { // 更新笔记本, NoteId可能也要更改 // notebook是服务器传过来的 updateNotebookForceForSendChange: function(notebookId, notebook, callback) { + var me = this; notebook.IsDirty = false; notebook.LocalIsNew = false; notebook.ServerNotebookId = notebook.NotebookId; diff --git a/public/js/app/notebook.js b/public/js/app/notebook.js index 41d9f468..5b8307c9 100644 --- a/public/js/app/notebook.js +++ b/public/js/app/notebook.js @@ -768,7 +768,7 @@ Notebook.updateNotebookTitle = function(target) { }; Notebook.doUpdateNotebookTitle = function(notebookId, newTitle) { var self = Notebook; - ajaxPost("/notebook/updateNotebookTitle", {notebookId: notebookId, title: newTitle}, function(ret) { + NotebookService.updateNotebookTitle(notebookId, newTitle, function() { // 修改缓存 Notebook.cache[notebookId].Title = newTitle; // 改变nav diff --git a/public/js/app/service.js b/public/js/app/service.js index f09959a6..9493a79d 100644 --- a/public/js/app/service.js +++ b/public/js/app/service.js @@ -15,6 +15,9 @@ var Service = { var ApiService = Service.apiService; var UserService = Service.userService; var SyncService = Service.syncServie; +var NoteService = Service.noteService; +var NotebookService = Service.notebookService; +var TagService = Service.tagService; var ServerService = require('server'); // 分发服务