diff --git a/node_modules/api.js b/node_modules/api.js index 9ace480d..1e6ffde2 100644 --- a/node_modules/api.js +++ b/node_modules/api.js @@ -401,11 +401,13 @@ var Api = { }, // 删除 - deleteNote: function(note, callback) { + deleteTrash: function(note, callback) { var me = this; var data = {noteId: note.ServerNoteId, usn: note.Usn}; - log('delete notebook'); - needle.post(me.getUrl('note/deleteNote'), data, {}, function(err, resp) { + log('delete note'); + // 这里要重新require下, 不然为{} + Note = require('note'); + needle.post(me.getUrl('note/deleteTrash'), data, {}, function(err, resp) { if(err) { return callback(false); } @@ -435,5 +437,12 @@ var Api = { }); }, + + test: function() { + log("??"); + Note = require('note'); + log(Note); + } + }; module.exports = Api; diff --git a/node_modules/note.js b/node_modules/note.js index 0235f007..42b45ebf 100644 --- a/node_modules/note.js +++ b/node_modules/note.js @@ -135,6 +135,25 @@ var Note = { }); }, + deleteNote: function(noteId, callback) { + Notes.update({NoteId: noteId}, {$set: {IsTrash: true, IsDirty: true}}, function(err, n) { + if(err || !n) { + callback(false); + } else { + callback(true); + } + }); + }, + deleteTrash: function(noteId, callback) { + Notes.update({NoteId: noteId}, {$set: {IsDirty: true, LocalIsDelete: true}}, function(err, n) { + if(err || !n) { + callback(false); + } else { + callback(true); + } + }); + }, + // 得到笔记 getNote: function(noteId, callback) { var me = this; diff --git a/node_modules/sync.js b/node_modules/sync.js index 27ea84b1..6a97d22a 100644 --- a/node_modules/sync.js +++ b/node_modules/sync.js @@ -528,15 +528,6 @@ var Sync = { // 调api, 所有执行后再callback(); // 一个一个同步执行, 因为要有 async.eachSeries(notes, function(note, cb) { - /* - var api = Api.updateNote; - if(note.LocalIsNew) { - api = Api.addNote; - } else if(note.LocalIsDelete) { - api = Api.deleteNote; - } - */ - if(note.LocalIsNew) { // 添加 Api.addNote(note, function(newNote) { @@ -558,9 +549,10 @@ var Sync = { // 删除, 不管它了 // TODO Api.deleteTrash(note, function(ret) { - if(!Common.isOk(ret)) { - return cb(); + if(Common.isOk(ret)) { + me.checkNeedIncSyncAgain(ret.Usn); } + return cb(); }); } else { // 更新 @@ -581,7 +573,7 @@ var Sync = { Note.updateNoteForceForSendChange({NoteId: note.NoteId, Usn: ret.Usn}); me.checkNeedIncSyncAgain(ret.Usn); - + return cb(); }); } diff --git a/public/js/app/note.js b/public/js/app/note.js index ea52ca22..f6c28c09 100644 --- a/public/js/app/note.js +++ b/public/js/app/note.js @@ -1054,14 +1054,16 @@ Note.deleteNote = function(target, contextmenuItem, isShared) { // 2 var note = Note.cache[noteId]; var url = "/note/deleteNote" + var serverFunc = NoteService.deleteNote; if(note.IsTrash) { url = "/note/deleteTrash"; + serverFunc = NoteService.deleteTrash; } else { // 减少数量 Notebook.minusNotebookNumberNotes(note.NotebookId); } - - ajaxGet(url, {noteId: noteId, userId: note.UserId, isShared: isShared}, function(ret) { + + serverFunc.call(NoteService, noteId, function(ret) { if(ret) { Note.changeToNext(target); diff --git a/test.js b/test.js index a7d2590f..174859a4 100755 --- a/test.js +++ b/test.js @@ -16,11 +16,14 @@ Api.addNotebook({ Title: "哈哈" }, function() {}); */ +Api.test(); +/* User.userId = '54bdc65599c37b0da9000002'; console.log(User.getCurActiveUserId()); Note.getDirtyNotes(function(ret) { console.log(ret); }); +*/ /* Note.getNoteByServerNoteId("54c6313799c37bdeec000008", function(ret){ console.log(ret);