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

bug fix

Browse Source
This commit is contained in:
life
2015-11-10 00:05:43 +08:00
parent f20120ebdf
commit 81a9b43e3d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
node_modules/note.js generated vendored
View File

@@ -1339,8 +1339,8 @@ var Note = {
return callback && callback(false); return callback && callback(false);
} else { } else {
// 每一个笔记得到图片, 附件信息和数据 // 每一个笔记得到图片, 附件信息和数据
note.Content = me.fixContentUrl(note.Content);
async.eachSeries(notes, function(note, cb) { async.eachSeries(notes, function(note, cb) {
note.Content = me.fixContentUrl(note.Content);
me.getNoteFiles(note, function(files) { me.getNoteFiles(note, function(files) {
note.Content = me.fixNoteContentForSend(note.Content); note.Content = me.fixNoteContentForSend(note.Content);
// note.Files = files || []; // note.Files = files || [];
@@ -1554,7 +1554,8 @@ var Note = {
console.log('syncImages..................'); console.log('syncImages..................');
// console.log(content); // console.log(content);
// 得到图片id // 得到图片id
var reg = new RegExp(Evt.localUrl + "/api/file/getImage\\?fileId=(.{24})\"", 'g'); // var reg = new RegExp(Evt.localUrl + "/api/file/getImage\\?fileId=(.{24})\"", 'g');
var reg = new RegExp(Evt.getImageLocalUrlPrefix() + "\\?fileId=([0-9a-zA-Z]{24})", 'g');
// var a = 'abdfileId="xxx" alksdjfasdffileId="life"'; // var a = 'abdfileId="xxx" alksdjfasdffileId="life"';
// var reg = /fileId="(.+?)"/g; // var reg = /fileId="(.+?)"/g;
var s; var s;

3
node_modules/server.js generated vendored
View File

@@ -42,6 +42,7 @@ var Server = {
return; return;
} }
// 如果可以使用协议, 则使用
if (Evt.canUseProtocol()) { if (Evt.canUseProtocol()) {
me.initProtocol(); me.initProtocol();
me._started = true; me._started = true;
@@ -140,9 +141,9 @@ var Server = {
return; return;
} }
this.server.close(function(err) { this.server.close(function(err) {
callback && callback();
}); });
this._started = false; this._started = false;
callback && callback();
}, },
e404: function(res) { e404: function(res) {