diff --git a/src/public/app/services/tab_context.js b/src/public/app/services/tab_context.js index 1bde9d523..b4aee5cc1 100644 --- a/src/public/app/services/tab_context.js +++ b/src/public/app/services/tab_context.js @@ -60,7 +60,6 @@ class TabContext extends Component { this.notePath = resolvedNotePath; this.noteId = noteId; - this.autoBookDisabled = false; this.textPreviewDisabled = false; this.codePreviewDisabled = false; diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js index e490ba466..1b373274b 100644 --- a/src/public/app/widgets/note_detail.js +++ b/src/public/app/widgets/note_detail.js @@ -169,17 +169,6 @@ export default class NoteDetailWidget extends TabAwareWidget { let type = note.type; - if (type === 'text' && !this.tabContext.autoBookDisabled - && note.hasChildren() - && utils.isDesktop()) { - - const noteComplement = await this.tabContext.getNoteComplement(); - - if (utils.isHtmlEmpty(noteComplement.content)) { - type = 'book'; - } - } - if (type === 'text' && !this.tabContext.textPreviewDisabled) { const noteComplement = await this.tabContext.getNoteComplement(); @@ -308,12 +297,6 @@ export default class NoteDetailWidget extends TabAwareWidget { this.spacedUpdate.updateNowIfNecessary(); } - autoBookDisabledEvent({tabContext}) { - if (this.isTab(tabContext.tabId)) { - this.refresh(); - } - } - textPreviewDisabledEvent({tabContext}) { if (this.isTab(tabContext.tabId)) { this.refresh(); diff --git a/src/public/app/widgets/note_list.js b/src/public/app/widgets/note_list.js index 2a050bade..f3ac4b4ba 100644 --- a/src/public/app/widgets/note_list.js +++ b/src/public/app/widgets/note_list.js @@ -27,7 +27,8 @@ export default class NoteListWidget extends TabAwareWidget { && ( ['book', 'search', 'code'].includes(this.note.type) || (this.note.type === 'text' && this.note.hasChildren()) - ); + ) + && !this.note.hasLabel('hideChildrenOverview'); } doRender() { @@ -92,12 +93,6 @@ export default class NoteListWidget extends TabAwareWidget { this.checkRenderStatus(); } - autoBookDisabledEvent({tabContext}) { - if (this.isTab(tabContext.tabId)) { - this.refresh(); - } - } - notesReloadedEvent({noteIds}) { if (noteIds.includes(this.noteId)) { this.refresh(); diff --git a/src/public/app/widgets/type_widgets/book.js b/src/public/app/widgets/type_widgets/book.js index dc39368c7..921cf5796 100644 --- a/src/public/app/widgets/type_widgets/book.js +++ b/src/public/app/widgets/type_widgets/book.js @@ -15,11 +15,6 @@ const TPL = `
This note of type Book doesn't have any child notes so there's nothing to display. See wiki for details.
- -
- This note doesn't have any content so we display its children. -
Click here if you want to add some text. -
`; export default class BookTypeWidget extends TypeWidget { @@ -29,17 +24,9 @@ export default class BookTypeWidget extends TypeWidget { this.$widget = $(TPL); this.contentSized(); this.$helpNoChildren = this.$widget.find('.note-detail-book-empty-help'); - - this.$helpAutoBook = this.$widget.find('.note-detail-book-auto-help'); - this.$helpAutoBook.find('a').on('click', () => { - this.tabContext.autoBookDisabled = true; - - this.triggerEvent('autoBookDisabled', {tabContext: this.tabContext}); - }); } async doRefresh(note) { this.$helpNoChildren.toggle(!this.note.hasChildren()); - this.$helpAutoBook.toggle(this.note.type !== 'book'); } } diff --git a/src/public/app/widgets/type_widgets/editable_code.js b/src/public/app/widgets/type_widgets/editable_code.js index c54a4efad..f18b919f8 100644 --- a/src/public/app/widgets/type_widgets/editable_code.js +++ b/src/public/app/widgets/type_widgets/editable_code.js @@ -11,7 +11,7 @@ const TPL = ` } .note-detail-code-editor { - min-height: 300px; + min-height: 50px; } diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js index 9ea09e48d..57b1cd40d 100644 --- a/src/public/app/widgets/type_widgets/editable_text.js +++ b/src/public/app/widgets/type_widgets/editable_text.js @@ -62,8 +62,7 @@ const TPL = ` padding-top: 10px; 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: 300px; + min-height: 50px; } diff --git a/src/public/app/widgets/type_widgets/type_widget.js b/src/public/app/widgets/type_widgets/type_widget.js index d5454ebad..cf06a163b 100644 --- a/src/public/app/widgets/type_widgets/type_widget.js +++ b/src/public/app/widgets/type_widgets/type_widget.js @@ -45,12 +45,6 @@ export default class TypeWidget extends TabAwareWidget { this.$widget.scrollTop(0); } - autoBookDisabledEvent({tabContext}) { - if (this.isTab(tabContext.tabId)) { - this.refresh(); - } - } - textPreviewDisabledEvent({tabContext}) { if (this.isTab(tabContext.tabId)) { this.refresh();