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

UI && copy image on web

Browse Source 
FileReader只能在web端, 不能在nodejs端, 之前可以的啊?
This commit is contained in:
life
2015-03-02 21:56:42 +08:00
parent 0ba0cca725
commit c2adc45da6
149 changed files with 614 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node_modules/common.js generated vendored
View File

@@ -6,7 +6,7 @@ var ObjectId = require('objectid');
// var gui = require('nw.gui');
// console.log(gui.App);
/*
/*
// 开发版
process.on('uncaughtException', function (err) {
// 打印出错误

120
node_modules/file.js generated vendored
View File

@@ -29,7 +29,29 @@ type File struct {
// 文件服务
var File = {
// data在web端获取到, 在nodejs端会有错误!!
pasteImage2: function(data, callback) {
var me = this;
data = data.replace(/^data:image\/\w+;base64,/, "");
// log(User.getCurUserImagesPath());
var filename = Common.uuid() + '.png';
var filePath = User.getCurUserImagesPath() + '/' + filename;
console.log(filePath);
// return;
fs.writeFile(filePath, new Buffer(data, 'base64'), function(err) {
if(err) {
console.log(err);
return;
}
// return;
// 保存
// var relativePath = User.getCurUserImagesAppPath() + '/' + filename;
// 保存到数据库中
me._addImage(Common.objectId(), filePath, function(newImg) {
callback && callback(Evt.getImageLocalUrl(newImg.FileId));
});
});
},
// FileReaderWeb 是 web上的FileReader, 可能与nodejs这个有冲突
pasteImage: function(event, FileReaderWeb, callback) {
var me = this;
@@ -42,47 +64,67 @@ var File = {
}
}
// console.log("paste images");
// console.log(blob);
console.log(blob);
// load image if there is a pasted image
if (blob) {
// console.log("??");
var reader = new FileReaderWeb();
// console.log(">>")
// console.log(reader);
// console.log(">>")
reader.onloadend = function() {
console.log(reader);
// 这个事件在读取结束后，无论成功或者失败都会触发
if (reader.error) {
console.log(reader.error);
} else {
}
}
reader.onload = function(e) {
// 上传之
// log('result');
// log(reader.result);
var ret = reader.result
ret = ret.replace(/^data:image\/\w+;base64,/, "")
// log(User.getCurUserImagesPath());
var filename = Common.uuid() + '.png';
fs.writeFile(User.getCurUserImagesPath() + '/' + filename, new Buffer(ret, 'base64'), function(err) {
if(err) {
log(err);
return;
try {
// console.log("??");
var reader = new FileReaderWeb();
// console.log(">>")
// return;
// console.log(">>")
/*
reader.onloadend = function() {
console.log(reader);
// 这个事件在读取结束后，无论成功或者失败都会触发
if (reader.error) {
console.log(reader.error);
} else {
}
// 保存
var relativePath = User.getCurUserImagesAppPath() + '/' + filename;
// 保存到数据库中
File.addImage(relativePath, function(newImg) {
callback && callback(Evt.getImageLocalUrl(newImg.FileId));
// callback && callback('app://leanote/' + relativePath);
});
});
};
reader.readAsDataURL(blob);
}
};
console.log("-----------");
reader.onload = function(e) {
// alert(3);
console.log('haha');
return;
// 上传之
// log('result');
// log(reader.result);
var ret = reader.result;
ret = ret.replace(/^data:image\/\w+;base64,/, "");
console.log(ret);
return;
// log(User.getCurUserImagesPath());
var filename = Common.uuid() + '.png';
var filePath = User.getCurUserImagesPath() + '/' + filename;
console.log(filePath);
return;
fs.writeFile(filePath, new Buffer(ret, 'base64'), function(err) {
if(err) {
log(err);
return;
}
// 保存
// var relativePath = User.getCurUserImagesAppPath() + '/' + filename;
// 保存到数据库中
File.addImage(filePath, function(newImg) {
callback && callback(Evt.getImageLocalUrl(newImg.FileId));
// callback && callback('app://leanote/' + relativePath);
});
});
};
*/
console.log(reader);
console.log("??");
reader.onloadend = function() {
console.log('end');
console.log(reader.result);
};
reader.readAsDataURL(blob);
} catch(e) {
console.log(e);
}
};
},
// path是相对于项目路径

1
node_modules/server.js generated vendored
View File

@@ -110,6 +110,7 @@ var Server = {
var me = this;
var ext = path.extname(filePath);
ext = ext ? ext.slice(1) : 'unknown';
filePath = filePath + '';
fs.readFile(filePath, "binary", function (err, file) {
if (err) {
res.writeHead(500, {