From 8dfdd090f5addf5f836c8a38ddfc76f48af09f0e Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 24 Feb 2020 22:46:27 +0100 Subject: [PATCH] use note's css class also in book and included note, closes #879 --- .../services/note_content_renderer.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/public/javascripts/services/note_content_renderer.js b/src/public/javascripts/services/note_content_renderer.js index dafa39579..0d23e9acc 100644 --- a/src/public/javascripts/services/note_content_renderer.js +++ b/src/public/javascripts/services/note_content_renderer.js @@ -7,7 +7,7 @@ import protectedSessionHolder from "./protected_session_holder.js"; async function getRenderedContent(note) { const type = getRenderingType(note); - let rendered; + let $rendered; if (type === 'text') { const fullNote = await server.get('notes/' + note.noteId); @@ -15,23 +15,23 @@ async function getRenderedContent(note) { const $content = $("
").html(fullNote.content); if (utils.isHtmlEmpty(fullNote.content)) { - rendered = ""; + $rendered = ""; } else { - rendered = $content; + $rendered = $content; } } else if (type === 'code') { const fullNote = await server.get('notes/' + note.noteId); if (fullNote.content.trim() === "") { - rendered = ""; + $rendered = ""; } - rendered = $("
").text(fullNote.content);
+        $rendered = $("
").text(fullNote.content);
     }
     else if (type === 'image') {
-        rendered = $("").attr("src", `api/images/${note.noteId}/${note.title}`);
+        $rendered = $("").attr("src", `api/images/${note.noteId}/${note.title}`);
     }
     else if (type === 'file') {
         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
         $openButton.toggle(!note.isProtected);
 
-        rendered = $('
') + $rendered = $('
') .append($downloadButton) .append('   ') .append($openButton); @@ -66,23 +66,27 @@ async function getRenderedContent(note) { await renderService.render(note, $el, this.ctx); - rendered = $el; + $rendered = $el; } else if (type === 'protected-session') { const $button = $(``) .on('click', protectedSessionService.enterProtectedSession); - rendered = $("
") + $rendered = $("
") .append("
This note is protected and to access it you need to enter password.
") .append("
") .append($button); } else { - rendered = "Content of this note cannot be displayed in the book format"; + $rendered = $("Content of this note cannot be displayed in the book format"); + } + + if (note.cssClass) { + $rendered.addClass(note.cssClass); } return { - renderedContent: rendered, + renderedContent: $rendered, type }; }