zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-01-16 12:08:03 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source
This commit is contained in:
zadam 2020-07-26 23:47:31 +02:00
commit c92526372c
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/services/notes.js
View file

@ -277,15 +277,9 @@ async function downloadImage(noteId, imageUrl) {
const downloadImagePromises = {}; const downloadImagePromises = {};
function replaceUrl(content, url, imageNote) { function replaceUrl(content, url, imageNote) {
if (url.length > 2000) { const quotedUrl = utils.quoteRegex(url);
// for very large inline base64 images which fail on regex max size
return content.replace(url, `api/images/${imageNote.noteId}/${imageNote.title}`);
}
else {
const quotedUrl = utils.quoteRegex(url);
return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`); return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`);
}
} }
function downloadImages(noteId, content) { function downloadImages(noteId, content) {
@ -306,7 +300,9 @@ function downloadImages(noteId, content) {
const imageService = require('../services/image'); const imageService = require('../services/image');
const {note} = await imageService.saveImage(noteId, imageBuffer, "inline image", true); const {note} = await imageService.saveImage(noteId, imageBuffer, "inline image", true);
content = replaceUrl(content, url, note); content = content.substr(0, match.index)
+ `<img src="api/images/${note.noteId}/${note.title}"`
+ content.substr(match.index + match[0].length);
} }
else if (!url.includes('api/images/') else if (!url.includes('api/images/')
// this is an exception for the web clipper's "imageId" // this is an exception for the web clipper's "imageId"