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

Merge remote-tracking branch 'origin/stable'

Browse Source
This commit is contained in:
zadam 2021-04-11 22:28:30 +02:00
commit 58e4bd4974
3 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/public/app/widgets/type_widgets/abstract_text_type_widget.js
View File

@ -5,24 +5,47 @@ import linkService from "../../services/link.js";
import noteContentRenderer from "../../services/note_content_renderer.js"; import noteContentRenderer from "../../services/note_content_renderer.js";
export default class AbstractTextTypeWidget extends TypeWidget { export default class AbstractTextTypeWidget extends TypeWidget {
doRender() { setupImageOpening(singleClickOpens) {
this.$widget.on("dblclick", "img", e => { this.$widget.on("dblclick", "img", e => this.openImageInCurrentTab($(e.target)));
const $img = $(e.target);
const src = $img.prop("src");
const match = src.match(/\/api\/images\/([A-Za-z0-9]+)\//); this.$widget.on("click", "img", e => {
if ((e.which === 1 && e.ctrlKey) || e.which === 2) {
if (match) { this.openImageInNewTab($(e.target));
const noteId = match[1];
appContext.tabManager.getActiveTabContext().setNote(noteId);
} }
else { else if (e.which === 1 && singleClickOpens) {
window.open(src, '_blank'); this.openImageInCurrentTab($(e.target));
} }
}); });
} }
openImageInCurrentTab($img) {
const imgSrc = $img.prop("src");
const noteId = this.getNoteIdFromImage(imgSrc);
if (noteId) {
appContext.tabManager.getActiveTabContext().setNote(noteId);
} else {
window.open(imgSrc, '_blank');
}
}
openImageInNewTab($img) {
const imgSrc = $img.prop("src");
const noteId = this.getNoteIdFromImage(imgSrc);
if (noteId) {
appContext.tabManager.openTabWithNoteWithHoisting(noteId);
} else {
window.open(imgSrc, '_blank');
}
}
getNoteIdFromImage(imgSrc) {
const match = imgSrc.match(/\/api\/images\/([A-Za-z0-9]+)\//);
return match ? match[1] : null;
}
async loadIncludedNote(noteId, $el) { async loadIncludedNote(noteId, $el) {
const note = await treeCache.getNote(noteId); const note = await treeCache.getNote(noteId);

2
src/public/app/widgets/type_widgets/editable_text.js
View File

@ -84,6 +84,8 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
keyboardActionService.setupActionsForElement('text-detail', this.$widget, this); keyboardActionService.setupActionsForElement('text-detail', this.$widget, this);
this.setupImageOpening(false);
super.doRender(); super.doRender();
} }

3
src/public/app/widgets/type_widgets/read_only_text.js
View File

@ -34,6 +34,7 @@ const TPL = `
.note-detail-readonly-text img { .note-detail-readonly-text img {
max-width: 100%; max-width: 100%;
cursor: pointer;
} }
.edit-text-note-button { .edit-text-note-button {
@ -67,6 +68,8 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget {
this.triggerEvent('textPreviewDisabled', {tabContext: this.tabContext}); this.triggerEvent('textPreviewDisabled', {tabContext: this.tabContext});
}); });
this.setupImageOpening(true);
super.doRender(); super.doRender();
} }