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

web view fixes + disclaimer

Browse Source
This commit is contained in:
zadam 2022-06-18 15:52:09 +02:00
parent 6cb5144c09
commit 4f86d769be
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/services/note_types.js
View File

@ -12,7 +12,7 @@ async function getNoteTypeItems(command) {
{ title: "Book", command: command, type: "book", uiIcon: "bx bx-book" },
{ title: "Mermaid Diagram", command: command, type: "mermaid", uiIcon: "bx bx-selection" },
{ title: "Canvas", command: command, type: "canvas", uiIcon: "bx bx-pen" },
{ title: "Web View", command: command, type: "iframe", uiIcon: "bx bx-globe-alt" },
{ title: "Web View", command: command, type: "web-view", uiIcon: "bx bx-globe-alt" },
];
const templateNoteIds = await server.get("search-templates");

12
src/public/app/widgets/type_widgets/web_view.js
View File

@ -3,10 +3,16 @@ import attributeService from "../../services/attributes.js";
const TPL = `
<div class="note-detail-web-view note-detail-printable" style="height: 100%">
<div class="note-detail-web-view-help alert alert-warning" style="margin: 50px; padding: 20px;">
<p><strong>This help note is shown because this note of type WebView HTML doesn't have required label to function properly.</strong></p>
<div class="note-detail-web-view-help alert alert-warning" style="margin: 50px; padding: 20px 20px 0px 20px;">
<h4>Web View</h4>
<p>Note of type Web View allow you to embed websites into Trilium.</p>
<p>Please create label with a URL address you want to embed, e.g. <code>#webViewSrc="http://www.google.com"</code></p>
<p>To start, please create a label with a URL address you want to embed, e.g. <code>#webViewSrc="http://www.google.com"</code></p>
<h4>Disclaimer on the experimental status</h4>
<p>Web View is an experimental note type, and it might be removed or substantially changed in the future. Web View works also only in the desktop build.</p>
</div>
<webview class="note-detail-web-view-content"></webview>

2
src/services/notes.js
View File

@ -55,7 +55,7 @@ function deriveMime(type, mime) {
mime = 'text/plain';
} else if (['relation-map', 'search', 'canvas'].includes(type)) {
mime = 'application/json';
} else if (['render', 'book', 'iframe'].includes(type)) {
} else if (['render', 'book', 'web-view'].includes(type)) {
mime = '';
} else {
mime = 'application/octet-stream';