gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into stable

Browse Source
This commit is contained in:
zadam 2020-08-27 23:22:58 +02:00
commit dc288fb18c
6 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.43.0-beta", "version": "0.43.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -7923,9 +7923,9 @@
"integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="
}, },
"node-abi": { "node-abi": {
"version": "2.16.0", "version": "2.18.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz",
"integrity": "sha512-+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA==", "integrity": "sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw==",
"requires": { "requires": {
"semver": "^5.4.1" "semver": "^5.4.1"
}, },

2
package.json
View File

@ -54,7 +54,7 @@
"jimp": "0.10.3", "jimp": "0.10.3",
"mime-types": "2.1.27", "mime-types": "2.1.27",
"multer": "1.4.2", "multer": "1.4.2",
"node-abi": "2.16.0", "node-abi": "2.18.0",
"open": "7.0.3", "open": "7.0.3",
"portscanner": "2.2.0", "portscanner": "2.2.0",
"rand-token": "1.0.1", "rand-token": "1.0.1",

15
src/public/app/widgets/collapsible_widgets/link_map.js
View File

@ -1,4 +1,5 @@
import CollapsibleWidget from "../collapsible_widget.js"; import CollapsibleWidget from "../collapsible_widget.js";
import treeCache from "../../services/tree_cache.js";
let linkMapContainerIdCtr = 1; let linkMapContainerIdCtr = 1;
@ -89,5 +90,19 @@ export default class LinkMapWidget extends CollapsibleWidget {
if (loadResults.getAttributes().find(attr => attr.type === 'relation' && (attr.noteId === this.noteId || attr.value === this.noteId))) { if (loadResults.getAttributes().find(attr => attr.type === 'relation' && (attr.noteId === this.noteId || attr.value === this.noteId))) {
this.noteSwitched(); this.noteSwitched();
} }
const changedNoteIds = loadResults.getNoteIds();
if (changedNoteIds.length > 0) {
const $linkMapContainer = this.$body.find('.link-map-container');
for (const noteId of changedNoteIds) {
const note = treeCache.notes[noteId];
if (note) {
$linkMapContainer.find(`a[data-note-path="${noteId}"]`).text(note.title);
}
}
}
} }
} }

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

@ -32,6 +32,7 @@ const TPL = `
.tree { .tree {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
padding-bottom: 20px;
} }
.refresh-search-button { .refresh-search-button {

4
src/public/app/widgets/side_pane_toggles.js
View File

@ -20,8 +20,8 @@ const TPL = `
} }
</style> </style>
<button class="hide-left-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Show sidebar"></button> <button class="hide-left-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Hide sidebar"></button>
<button class="show-left-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Hide sidebar"></button> <button class="show-left-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Show sidebar"></button>
<button class="hide-right-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Hide sidebar"></button> <button class="hide-right-pane-button btn btn-sm icon-button bx bx-chevrons-right" title="Hide sidebar"></button>
<button class="show-right-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Show sidebar"></button> <button class="show-right-pane-button btn btn-sm icon-button bx bx-chevrons-left" title="Show sidebar"></button>

20
src/services/image.js
View File

@ -98,7 +98,17 @@ async function saveImage(parentNoteId, uploadBuffer, originalName, shrinkImageSw
async function shrinkImage(buffer, originalName) { async function shrinkImage(buffer, originalName) {
// we do resizing with max (100) quality which will be trimmed during optimization step next // we do resizing with max (100) quality which will be trimmed during optimization step next
const resizedImage = await resize(buffer, 100); let resizedImage;
try {
resizedImage = await resize(buffer, 100);
}
catch (e) {
log.error("Failed to resize image '" + originalName + "'\nStack: " + e.stack);
resizedImage = buffer;
}
let finalImageBuffer; let finalImageBuffer;
const jpegQuality = await optionService.getOptionInt('imageJpegQuality'); const jpegQuality = await optionService.getOptionInt('imageJpegQuality');
@ -107,8 +117,16 @@ async function shrinkImage(buffer, originalName) {
finalImageBuffer = await optimize(resizedImage, jpegQuality); finalImageBuffer = await optimize(resizedImage, jpegQuality);
} catch (e) { } catch (e) {
log.error("Failed to optimize image '" + originalName + "'\nStack: " + e.stack); log.error("Failed to optimize image '" + originalName + "'\nStack: " + e.stack);
try {
finalImageBuffer = await resize(buffer, jpegQuality); finalImageBuffer = await resize(buffer, jpegQuality);
} }
catch (e) {
log.error("Failed to resize image '" + originalName + "'\nStack: " + e.stack);
finalImageBuffer = buffer;
}
}
// if resizing & shrinking did not help with size then save the original // if resizing & shrinking did not help with size then save the original
// (can happen when e.g. resizing PNG into JPEG) // (can happen when e.g. resizing PNG into JPEG)