diff --git a/src/public/javascripts/entities/note_short.js b/src/public/javascripts/entities/note_short.js index d5a18bc09..55cb896e9 100644 --- a/src/public/javascripts/entities/note_short.js +++ b/src/public/javascripts/entities/note_short.js @@ -24,7 +24,7 @@ class NoteShort { } async getChildBranches() { - if (!this.treeCache.children) { + if (!this.treeCache.children[this.noteId]) { return []; } diff --git a/src/public/javascripts/services/note_detail.js b/src/public/javascripts/services/note_detail.js index cbf648f74..fa287b599 100644 --- a/src/public/javascripts/services/note_detail.js +++ b/src/public/javascripts/services/note_detail.js @@ -176,12 +176,18 @@ async function loadNoteDetail(noteId) { // after loading new note make sure editor is scrolled to the top $noteDetailWrapper.scrollTop(0); - await loadLabelList(); + const labels = await loadLabelList(); - await showChildrenOverview(); + const hideChildrenOverview = labels.some(label => label.name === 'hideChildrenOverview'); + await showChildrenOverview(hideChildrenOverview); } -async function showChildrenOverview() { +async function showChildrenOverview(hideChildrenOverview) { + if (hideChildrenOverview) { + $childrenOverview.hide(); + return; + } + const note = getCurrentNote(); $childrenOverview.empty(); @@ -197,6 +203,8 @@ async function showChildrenOverview() { const childEl = $('
').html(link); $childrenOverview.append(childEl); } + + $childrenOverview.show(); } async function loadLabelList() { @@ -216,6 +224,8 @@ async function loadLabelList() { else { $labelList.hide(); } + + return labels; } async function loadNote(noteId) { diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css index 6292e1735..8b3bc0a0b 100644 --- a/src/public/stylesheets/style.css +++ b/src/public/stylesheets/style.css @@ -36,7 +36,7 @@ border: 0 !important; box-shadow: none !important; /* This is because with empty content height of editor is 0 and it's impossible to click into it */ - min-height: 400px; + min-height: 200px; overflow: auto; } @@ -291,7 +291,6 @@ div.ui-tooltip { } #children-overview { - padding-top: 20px; } .child-overview { @@ -305,6 +304,7 @@ div.ui-tooltip { border-radius: 15px; overflow: hidden; text-align: center; + margin-top: 15px; } .child-overview a { diff --git a/src/services/labels.js b/src/services/labels.js index 203844fbd..75ecd591a 100644 --- a/src/services/labels.js +++ b/src/services/labels.js @@ -11,7 +11,8 @@ const BUILTIN_LABELS = [ 'run', 'manualTransactionHandling', 'disableInclusion', - 'appCss' + 'appCss', + 'hideChildrenOverview' ]; async function getNotesWithLabel(name, value) { diff --git a/src/views/index.ejs b/src/views/index.ejs index b1e358f38..b98616b69 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -205,7 +205,7 @@
-
+