leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-17 08:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

同步笔记成功, 还要处理

Browse Source 
1. 笔记冲突
2. 同步图片
3. 增量同步
This commit is contained in:
life
2015-01-23 00:46:49 +08:00
parent 1d015642a6
commit f6cc411735
5 changed files with 131 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/js/app/note.js
View File

@@ -624,6 +624,12 @@ Note.changeNote = function(selectNoteId, isShare, needSaveChanged, callback) {
Note.contentAjaxSeq++;
var seq = Note.contentAjaxSeq;
function setContent(ret) {
if(ret) {
cacheNote.InitSync = false;
}
ret = ret || {};
log(">>")
log(ret);
Note.contentAjax = null;
if(seq != Note.contentAjaxSeq) {
return;
@@ -641,7 +647,8 @@ Note.changeNote = function(selectNoteId, isShare, needSaveChanged, callback) {
callback && callback(ret);
}
if(cacheNote.Content) {
// 不是刚同步过来的, 且有内容
if(!cacheNote.InitSync && cacheNote.Content) {
setContent(cacheNote);
return;
}
@@ -654,10 +661,7 @@ Note.changeNote = function(selectNoteId, isShare, needSaveChanged, callback) {
}
self.showContentLoading();
if(Note.contentAjax != null) {
Note.contentAjax.abort();
}
Note.contentAjax = ajaxGet(url, param, setContent);
Service.noteService.getNoteContent(cacheNote.NoteId, setContent); // ajaxGet(url, param, setContent);
}
// 渲染