From fdc99bb6f9c9385d8cbebcdb249d8a014823ca0a Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Tue, 25 Feb 2020 10:47:49 +0100
Subject: [PATCH] adapt merged changes from master

---
 src/public/javascripts/services/note_content_renderer.js | 4 +---
 src/public/javascripts/widgets/type_widgets/book.js      | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/public/javascripts/services/note_content_renderer.js b/src/public/javascripts/services/note_content_renderer.js
index 5c70e60b8..7a6ec1869 100644
--- a/src/public/javascripts/services/note_content_renderer.js
+++ b/src/public/javascripts/services/note_content_renderer.js
@@ -68,9 +68,7 @@ async function getRenderedContent(note) {
         $rendered = $("<em>Content of this note cannot be displayed in the book format</em>");
     }
 
-    if (note.cssClass) {
-        $rendered.addClass(note.cssClass);
-    }
+    $rendered.addClass(await note.getCssClass());
 
     return {
         renderedContent: $rendered,
diff --git a/src/public/javascripts/widgets/type_widgets/book.js b/src/public/javascripts/widgets/type_widgets/book.js
index 23d547e8f..c08dc5c4f 100644
--- a/src/public/javascripts/widgets/type_widgets/book.js
+++ b/src/public/javascripts/widgets/type_widgets/book.js
@@ -78,7 +78,7 @@ const TPL = `
         text-align: center;
     }
     
-    .note-book-card.type-image .note-book-content img {
+    .note-book-card.type-image .note-book-content img, .note-book-card.type-text .note-book-content img {
         max-width: 100%;
         max-height: 100%;
     }