gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgrade to ckeditor 12.1.0 which fixes some upload issues

Browse Source
This commit is contained in:
zadam 2019-04-15 21:08:31 +02:00
parent 147d79c65c
commit 25fe78012f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/ckeditor/ckeditor.js vendored
View File

File diff suppressed because one or more lines are too long

2
libraries/ckeditor/ckeditor.js.map
View File

File diff suppressed because one or more lines are too long

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.31.0-beta", "version": "0.31.1-beta",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
src/routes/api/image.js
View File

@ -14,7 +14,7 @@ async function returnImage(req, res) {
else if (image.type !== 'image') { else if (image.type !== 'image') {
return res.sendStatus(400); return res.sendStatus(400);
} }
else if (image.data === null) { else if (image.isDeleted || image.data === null) {
res.set('Content-Type', 'image/png'); res.set('Content-Type', 'image/png');
return res.send(fs.readFileSync(RESOURCE_DIR + '/db/image-deleted.png')); return res.send(fs.readFileSync(RESOURCE_DIR + '/db/image-deleted.png'));
} }