ace编辑器优化, 同步标签问题, 一次性上传多张图片

This commit is contained in:
life
2015-03-19 10:13:35 +08:00
parent c146d819c8
commit ebcab93fd7
314 changed files with 184 additions and 143 deletions

31
node_modules/api.js generated vendored
View File

@@ -81,7 +81,6 @@ var Api = {
url = url + '&' + paramStr;
}
url = url + '?' + paramStr;
console.log(url);
return url;
},
// 登录
@@ -565,16 +564,16 @@ var Api = {
note.Tags = [''];
}
var data = {
noteId: note.ServerNoteId,
notebookId: serverNotebookId || "",
title: note.Title,
usn: note.Usn,
isTrash: note.IsTrash,
content: note.Content,
isBlog: note.IsBlog, // 是否是博客
NoteId: note.ServerNoteId,
NotebookId: serverNotebookId || "",
Title: note.Title,
Usn: note.Usn,
IsTrash: note.IsTrash,
Content: note.Content,
IsBlog: note.IsBlog, // 是否是博客
Files: note.Files,
FileDatas: note.FileDatas,
tags: note.Tags, // 新添加
Tags: note.Tags, // 新添加
}
// 如果是markdown笔记, 则摘要也要传过去
@@ -582,8 +581,8 @@ var Api = {
data.Abstract = note.Abstract;
}
console.log('update note :');
console.log(data);
// console.log('update note :');
// console.log(data);
// files处理
var needMultiple = false;
@@ -593,15 +592,17 @@ var Api = {
}
needle.post(me.getUrl('note/updateNote'), data, {multipart: needMultiple}, function(err, resp) {
// console.log('update note ret------------------');
me.checkError(err, resp);
if(err) {
log('err');
log(err);
console.error('err');
console.log(err);
return callback(false);
}
var ret = resp.body;
log('update note ret:');
log(ret);
// console.log('update note ret:');
// console.log(ret);
// console.log(ret.Files);
// 没有传IsMarkdown, 后台会传过来总为false
delete ret['IsMarkdown'];
callback(ret);

8
node_modules/sync.js generated vendored
View File

@@ -531,6 +531,8 @@ var Sync = {
var afterInfo = me._syncInfo;
log('处理冲突....');
log(me._syncInfo);
log(me._syncInfo.tag);
var tag = me._syncInfo.tag;
// 如果是incSync, 则要前端处理
if(me.incrSyncStart) {
@@ -550,7 +552,11 @@ var Sync = {
});
// 添加或删除一些tag
Web.addOrDeleteTagFromSync(me._syncInfo.tag);
// console.log('怎么可能?')
// console.error(me._syncInfo.tag); // 为空, 不知道原因
// console.error();
// console.error(tag);
Web.addOrDeleteTagFromSync(tag);
}
},
fixConflictsForSendChanges: function(callback) {

2
node_modules/web.js generated vendored
View File

@@ -95,6 +95,8 @@ var Web = {
//
addOrDeleteTagFromSync: function(tagSyncInfo) {
var me = this;
// console.log("是啊");
// console.error(tagSyncInfo);
var adds = tagSyncInfo.adds;
me.Tag.addTagsNav(adds);
var deletes = tagSyncInfo.deletes;