Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-11-04 15:11:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

open attachment by double click

Browse Source
This commit is contained in:
zadam 2023-04-11 18:05:57 +02:00
parent 54c0268593
commit 9e71c44c76
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,10 +116,6 @@ export default class AttachmentDetailWidget extends BasicWidget {
} }
} }
openAttachmentDetailCommand() {
}
async entitiesReloadedEvent({loadResults}) { async entitiesReloadedEvent({loadResults}) {
const attachmentChange = loadResults.getAttachments().find(att => att.attachmentId === this.attachment.attachmentId); const attachmentChange = loadResults.getAttachments().find(att => att.attachmentId === this.attachment.attachmentId);

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

@ -3,47 +3,71 @@ import appContext from "../../components/app_context.js";
import froca from "../../services/froca.js"; import froca from "../../services/froca.js";
import linkService from "../../services/link.js"; import linkService from "../../services/link.js";
import noteContentRenderer from "../../services/note_content_renderer.js"; import noteContentRenderer from "../../services/note_content_renderer.js";
import utils from "../../services/utils.js";
export default class AbstractTextTypeWidget extends TypeWidget { export default class AbstractTextTypeWidget extends TypeWidget {
setupImageOpening(singleClickOpens) { setupImageOpening(singleClickOpens) {
this.$widget.on("dblclick", "img", e => this.openImageInCurrentTab($(e.target))); this.$widget.on("dblclick", "img", e => this.openImageInCurrentTab($(e.target)));
this.$widget.on("click", "img", e => { this.$widget.on("click", "img", e => {
if ((e.which === 1 && e.ctrlKey) || e.which === 2) { const isLeftClick = e.which === 1;
const isMiddleClick = e.which === 2;
const ctrlKey = utils.isCtrlKey(e);
if ((isLeftClick && ctrlKey) || isMiddleClick) {
this.openImageInNewTab($(e.target)); this.openImageInNewTab($(e.target));
} }
else if (e.which === 1 && singleClickOpens) { else if (isLeftClick && singleClickOpens) {
this.openImageInCurrentTab($(e.target)); this.openImageInCurrentTab($(e.target));
} }
}); });
} }
openImageInCurrentTab($img) { openImageInCurrentTab($img) {
const imgSrc = $img.prop("src"); const { noteId, viewScope } = this.parseFromImage($img);
const noteId = this.getNoteIdFromImage(imgSrc);
if (noteId) { if (noteId) {
appContext.tabManager.getActiveContext().setNote(noteId); appContext.tabManager.getActiveContext().setNote(noteId, { viewScope });
} else { } else {
window.open(imgSrc, '_blank'); window.open($img.prop("src"), '_blank');
} }
} }
openImageInNewTab($img) { openImageInNewTab($img) {
const imgSrc = $img.prop("src"); const { noteId, viewScope } = this.parseFromImage($img);
const noteId = this.getNoteIdFromImage(imgSrc);
if (noteId) { if (noteId) {
appContext.tabManager.openTabWithNoteWithHoisting(noteId); appContext.tabManager.openTabWithNoteWithHoisting(noteId, { viewScope });
} else { } else {
window.open(imgSrc, '_blank'); window.open($img.prop("src"), '_blank');
} }
} }
getNoteIdFromImage(imgSrc) { parseFromImage($img) {
const match = imgSrc.match(/\/api\/images\/([A-Za-z0-9_]+)\//); let noteId, viewScope;
return match ? match[1] : null; const imgSrc = $img.prop("src");
const imageNoteMatch = imgSrc.match(/\/api\/images\/([A-Za-z0-9_]+)\//);
if (imageNoteMatch) {
return {
noteId: imageNoteMatch[1],
viewScope: {}
}
}
const attachmentMatch = imgSrc.match(/\/api\/notes\/([A-Za-z0-9_]+)\/images\/([A-Za-z0-9_]+)\//);
if (attachmentMatch) {
return {
noteId: attachmentMatch[1],
viewScope: {
viewMode: 'attachments',
attachmentId: attachmentMatch[2]
}
}
}
return null;
} }
async loadIncludedNote(noteId, $el) { async loadIncludedNote(noteId, $el) {