zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-21 16:16:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

use note's css class also in book and included note, closes #879

Browse source
This commit is contained in:
zadam 2020-02-24 22:46:27 +01:00
parent fe7705524a
commit 8dfdd090f5
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/public/javascripts/services/note_content_renderer.js
View file

@ -7,7 +7,7 @@ import protectedSessionHolder from "./protected_session_holder.js";
async function getRenderedContent(note) { async function getRenderedContent(note) {
const type = getRenderingType(note); const type = getRenderingType(note);
let rendered; let $rendered;
if (type === 'text') { if (type === 'text') {
const fullNote = await server.get('notes/' + note.noteId); const fullNote = await server.get('notes/' + note.noteId);
@ -15,23 +15,23 @@ async function getRenderedContent(note) {
const $content = $("<div>").html(fullNote.content); const $content = $("<div>").html(fullNote.content);
if (utils.isHtmlEmpty(fullNote.content)) { if (utils.isHtmlEmpty(fullNote.content)) {
rendered = ""; $rendered = "";
} }
else { else {
rendered = $content; $rendered = $content;
} }
} }
else if (type === 'code') { else if (type === 'code') {
const fullNote = await server.get('notes/' + note.noteId); const fullNote = await server.get('notes/' + note.noteId);
if (fullNote.content.trim() === "") { if (fullNote.content.trim() === "") {
rendered = ""; $rendered = "";
} }
rendered = $("<pre>").text(fullNote.content); $rendered = $("<pre>").text(fullNote.content);
} }
else if (type === 'image') { else if (type === 'image') {
rendered = $("<img>").attr("src", `api/images/${note.noteId}/${note.title}`); $rendered = $("<img>").attr("src", `api/images/${note.noteId}/${note.title}`);
} }
else if (type === 'file') { else if (type === 'file') {
function getFileUrl() { function getFileUrl() {
@ -56,7 +56,7 @@ async function getRenderedContent(note) {
// open doesn't work for protected notes since it works through browser which isn't in protected session // open doesn't work for protected notes since it works through browser which isn't in protected session
$openButton.toggle(!note.isProtected); $openButton.toggle(!note.isProtected);
rendered = $('<div>') $rendered = $('<div>')
.append($downloadButton) .append($downloadButton)
.append(' &nbsp; ') .append(' &nbsp; ')
.append($openButton); .append($openButton);
@ -66,23 +66,27 @@ async function getRenderedContent(note) {
await renderService.render(note, $el, this.ctx); await renderService.render(note, $el, this.ctx);
rendered = $el; $rendered = $el;
} }
else if (type === 'protected-session') { else if (type === 'protected-session') {
const $button = $(`<button class="btn btn-sm"><span class="bx bx-log-in"></span> Enter protected session</button>`) const $button = $(`<button class="btn btn-sm"><span class="bx bx-log-in"></span> Enter protected session</button>`)
.on('click', protectedSessionService.enterProtectedSession); .on('click', protectedSessionService.enterProtectedSession);
rendered = $("<div>") $rendered = $("<div>")
.append("<div>This note is protected and to access it you need to enter password.</div>") .append("<div>This note is protected and to access it you need to enter password.</div>")
.append("<br/>") .append("<br/>")
.append($button); .append($button);
} }
else { else {
rendered = "<em>Content of this note cannot be displayed in the book format</em>"; $rendered = $("<em>Content of this note cannot be displayed in the book format</em>");
}
if (note.cssClass) {
$rendered.addClass(note.cssClass);
} }
return { return {
renderedContent: rendered, renderedContent: $rendered,
type type
}; };
} }