Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

fix image being redownloaded from localhost

Browse Source
This commit is contained in:
zadam
2020-05-04 10:03:54 +02:00
parent 8b5536ee3a
commit b89a2df462
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/public/app/widgets/note_tree.js
View File

@@ -51,7 +51,7 @@ const TPL = `
position: absolute; position: absolute;
top: 10px; top: 10px;
right: 20px; right: 20px;
z-index: 1000; z-index: 100;
} }
.tree-settings-popup { .tree-settings-popup {
@@ -514,6 +514,15 @@ export default class NoteTreeWidget extends TabAwareWidget {
return; return;
} }
if (parentNote.title === 'Siemens M55') {
console.log("this.hideIncludedImages", this.hideIncludedImages);
console.log("this.hideIncludedImages", this.hideIncludedImages);
console.log("parentNote.getRelations('imageLink')", parentNote.getRelations('imageLink'));
console.log("parentNote.getRelations('imageLink')", parentNote.getRelations('imageLink'));
const imageLinks = parentNote.getRelations('imageLink');
console.log("childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId))", childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId)));
}
if (this.hideIncludedImages) { if (this.hideIncludedImages) {
const imageLinks = parentNote.getRelations('imageLink'); const imageLinks = parentNote.getRelations('imageLink');

2
src/services/notes.js
View File

@@ -290,7 +290,7 @@ async function downloadImages(noteId, content) {
while (match = re.exec(origContent)) { while (match = re.exec(origContent)) {
const url = match[1]; const url = match[1];
if (!url.startsWith('api/images/') if (!url.includes('api/images/')
// this is and exception for the web clipper's "imageId" // this is and exception for the web clipper's "imageId"
&& (url.length !== 20 || url.toLowerCase().startsWith('http'))) { && (url.length !== 20 || url.toLowerCase().startsWith('http'))) {
if (url in downloadImagePromises) { if (url in downloadImagePromises) {