mirror of
https://github.com/leanote/desktop-app.git
synced 2025-10-17 08:38:18 +00:00
ace编辑器优化, 同步标签问题, 一次性上传多张图片
This commit is contained in:
8
node_modules/sync.js
generated
vendored
8
node_modules/sync.js
generated
vendored
@@ -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) {
|
||||
|
Reference in New Issue
Block a user