成功后才显示blog标志, 可点
This commit is contained in:
life
2015-03-16 00:36:47 +08:00
parent 238223d7b4
commit 88be5705ad
9 changed files with 164 additions and 82 deletions

7
node_modules/sync.js generated vendored
View File

@@ -72,7 +72,7 @@ var Sync = {
// 同步信息
me._syncInfo = {
notebook: {ok: false, changeAdds: [], changeConflicts: [], changeNeedAdds: [], adds: [], deletes: [], updates: []},
note: {ok: false, adds: [], changeAdds: [], changeConflicts: [], changeNeedAdds: [], deletes: [], updates: [], conflicts: []},
note: {ok: false, adds: [], changeAdds: [], changeConflicts: [], changeUpdates:[], changeNeedAdds: [], deletes: [], updates: [], conflicts: []},
tag: {ok: false, adds: [], changeAdds: [], changeConflicts: [], changeNeedAdds: [], deletes: [], updates: [], conflicts: []},
};
@@ -736,7 +736,7 @@ var Sync = {
// 一个一个同步执行, 因为要有
async.eachSeries(notes, function(note, cb) {
if(note.LocalIsNew) {
// 添加
// 添加, newNote的返回不会很多值(server端)
Api.addNote(note, function(newNote) {
if(!Common.isOk(newNote)) {
return cb();
@@ -744,6 +744,8 @@ var Sync = {
newNote.ServerNoteId = newNote.NoteId;
newNote.NoteId = note.NoteId;
newNote.IsBlog = note.IsBlog; // 前端要用
me._syncInfo.note.changeAdds.push(newNote);
Note.updateNoteForceForSendChange(newNote, true);
@@ -785,6 +787,7 @@ var Sync = {
ret.ServerNoteId = ret.NoteId;
ret.NoteId = note.NoteId;
Note.updateNoteForceForSendChange(ret, false);
me._syncInfo.note.changeUpdates.push(note);
me.checkNeedIncSyncAgain(ret.Usn);