gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-03-03 23:00:11 +01:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

test(client): broken test due to circular dependency
Some checks are pending
Checks / main (push) Waiting to run
Details
CodeQL Advanced / Analyze (actions) (push) Waiting to run
Details
CodeQL Advanced / Analyze (javascript-typescript) (push) Waiting to run
Details
Deploy Documentation / Build and Deploy Documentation (push) Waiting to run
Details
Dev / Test development (push) Waiting to run
Details
Dev / Build Docker image (push) Blocked by required conditions
Details
Dev / Check Docker build (Dockerfile) (push) Blocked by required conditions
Details
Dev / Check Docker build (Dockerfile.alpine) (push) Blocked by required conditions
Details
/ Check Docker build (Dockerfile) (push) Waiting to run
Details
/ Check Docker build (Dockerfile.alpine) (push) Waiting to run
Details
/ Build Docker images (Dockerfile, ubuntu-24.04-arm, linux/arm64) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.alpine, ubuntu-latest, linux/amd64) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v7) (push) Blocked by required conditions
Details
/ Build Docker images (Dockerfile.legacy, ubuntu-24.04-arm, linux/arm/v8) (push) Blocked by required conditions
Details
/ Merge manifest lists (push) Blocked by required conditions
Details
playwright / E2E tests on linux-arm64 (push) Waiting to run
Details
playwright / E2E tests on linux-x64 (push) Waiting to run
Details

Browse Source
This commit is contained in:
Elian Doran 2026-02-28 21:47:02 +02:00
parent 1d698106da
commit fe3dfc418f
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/client/src/services/content_renderer.ts
View File

@ -1,6 +1,7 @@
import "./content_renderer.css"; import "./content_renderer.css";
import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons"; import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
import { h, render } from "preact";
import WheelZoom from 'vanilla-js-wheel-zoom'; import WheelZoom from 'vanilla-js-wheel-zoom';
import FAttachment from "../entities/fattachment.js"; import FAttachment from "../entities/fattachment.js";
@ -16,8 +17,6 @@ import protectedSessionHolder from "./protected_session_holder.js";
import renderService from "./render.js"; import renderService from "./render.js";
import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js"; import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
import utils, { getErrorMessage } from "./utils.js"; import utils, { getErrorMessage } from "./utils.js";
import PdfViewer from "../widgets/type_widgets/file/PdfViewer";
import { h, render } from "preact";
let idCounter = 1; let idCounter = 1;
@ -58,7 +57,7 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo
} else if (["image", "canvas", "mindMap"].includes(type)) { } else if (["image", "canvas", "mindMap"].includes(type)) {
renderImage(entity, $renderedContent, options); renderImage(entity, $renderedContent, options);
} else if (!options.tooltip && ["file", "pdf", "audio", "video"].includes(type)) { } else if (!options.tooltip && ["file", "pdf", "audio", "video"].includes(type)) {
renderFile(entity, type, $renderedContent); await renderFile(entity, type, $renderedContent);
} else if (type === "mermaid") { } else if (type === "mermaid") {
await renderMermaid(entity, $renderedContent); await renderMermaid(entity, $renderedContent);
} else if (type === "render" && entity instanceof FNote) { } else if (type === "render" && entity instanceof FNote) {
@ -181,7 +180,7 @@ function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery<HTMLE
imageContextMenuService.setupContextMenu($img); imageContextMenuService.setupContextMenu($img);
} }
function renderFile(entity: FNote | FAttachment, type: string, $renderedContent: JQuery<HTMLElement>) { async function renderFile(entity: FNote | FAttachment, type: string, $renderedContent: JQuery<HTMLElement>) {
let entityType, entityId; let entityType, entityId;
if (entity instanceof FNote) { if (entity instanceof FNote) {
@ -199,6 +198,7 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
if (type === "pdf") { if (type === "pdf") {
const url = `../../api/${entityType}/${entityId}/open`; const url = `../../api/${entityType}/${entityId}/open`;
const $viewer = $(`<div style="height: 100%">`); const $viewer = $(`<div style="height: 100%">`);
const PdfViewer = (await import("../widgets/type_widgets/file/PdfViewer")).default;
render(h(PdfViewer, {pdfUrl: url, editable: false}), $viewer.get(0)!); render(h(PdfViewer, {pdfUrl: url, editable: false}), $viewer.get(0)!);
$content.append($viewer); $content.append($viewer);