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

内容相同时, 不冲突, 其它用户用服务器上的, 处理了图片url

Browse Source
This commit is contained in:
life
2015-03-19 21:07:35 +08:00
parent fadde521b2
commit c27e92d681
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node_modules/note.js generated vendored
View File

@@ -1057,7 +1057,11 @@ var Note = {
Api.getNoteContent(serverNote.NoteId, function(noteContent) { Api.getNoteContent(serverNote.NoteId, function(noteContent) {
// 同步到本地 // 同步到本地
if(Common.isOk(noteContent)) { if(Common.isOk(noteContent)) {
var serverContent = noteContent.Content; var serverContent = me.fixNoteContent(noteContent.Content); // 图片, 附件的链接
// var serverContent = noteContent.Content; // 图片, 附件的链接
// console.error(serverContent);
// console.error(localNote.Content);
// 没有冲突, 好, 用服务器端的其它值 // 没有冲突, 好, 用服务器端的其它值
if(serverContent == localNote.Content) { if(serverContent == localNote.Content) {