From d025cfee1bd9ec2edb57c3bae7a168549e1576d7 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sat, 4 Jan 2020 13:22:07 +0100
Subject: [PATCH] empty note with just included note should be saved, closes
 #807

---
 .../javascripts/services/note_detail_text.js       | 14 +++++++++-----
 src/public/javascripts/services/utils.js           |  6 +++++-
 src/public/stylesheets/style.css                   |  4 ++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/public/javascripts/services/note_detail_text.js b/src/public/javascripts/services/note_detail_text.js
index 068cedd46..d81d5aed0 100644
--- a/src/public/javascripts/services/note_detail_text.js
+++ b/src/public/javascripts/services/note_detail_text.js
@@ -116,15 +116,19 @@ class NoteDetailText {
     }
 
     getContent() {
-        let content = this.textEditor.getData();
+        const content = this.textEditor.getData();
 
         // if content is only tags/whitespace (typically <p>&nbsp;</p>), then just make it empty
         // this is important when setting new note to code
-        if (jQuery(content).text().trim() === '' && !content.includes("<img")) {
-            content = '';
-        }
+        return this.isContentEmpty(content) ? '' : content;
+    }
 
-        return content;
+    isContentEmpty(content) {
+        content = content.toLowerCase();
+
+        return jQuery(content).text().trim() === ''
+            && !content.includes("<img")
+            && !content.includes("<section")
     }
 
     async isReadOnly() {
diff --git a/src/public/javascripts/services/utils.js b/src/public/javascripts/services/utils.js
index 4436232df..c64882fd7 100644
--- a/src/public/javascripts/services/utils.js
+++ b/src/public/javascripts/services/utils.js
@@ -213,7 +213,11 @@ function closeActiveDialog() {
 }
 
 function isHtmlEmpty(html) {
-    return $("<div>").html(html).text().trim().length === 0 && !html.toLowerCase().includes('<img');
+    html = html.toLowerCase();
+
+    return $("<div>").html(html).text().trim().length === 0
+        && !html.includes('<img')
+        && !html.includes('<section');
 }
 
 async function clearBrowserCache() {
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 456f04f24..9ba8c9505 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -967,4 +967,8 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
     padding: 20px;
     border-radius: 10px;
     background-color: var(--accented-background-color);
+}
+
+.include-note.ck-placeholder::before { /* remove placeholder in otherwise empty note */
+    content: '' !important;
 }
\ No newline at end of file