From cd4b1235a74a159b4c3cffc37dd2311e5cded49d Mon Sep 17 00:00:00 2001 From: zadam Date: Thu, 27 Feb 2020 14:35:12 +0100 Subject: [PATCH] wip --- src/public/javascripts/widgets/tab_caching_widget.js | 6 +++--- src/public/javascripts/widgets/type_widgets/book.js | 8 -------- src/public/javascripts/widgets/type_widgets/code.js | 4 ---- src/public/javascripts/widgets/type_widgets/empty.js | 8 -------- src/public/javascripts/widgets/type_widgets/file.js | 8 -------- src/public/javascripts/widgets/type_widgets/image.js | 10 ---------- .../widgets/type_widgets/protected_session.js | 10 ---------- .../javascripts/widgets/type_widgets/relation_map.js | 4 ---- src/public/javascripts/widgets/type_widgets/render.js | 8 -------- src/public/javascripts/widgets/type_widgets/search.js | 6 ------ src/public/javascripts/widgets/type_widgets/text.js | 4 ---- .../javascripts/widgets/type_widgets/type_widget.js | 8 ++++++++ 12 files changed, 11 insertions(+), 73 deletions(-) diff --git a/src/public/javascripts/widgets/tab_caching_widget.js b/src/public/javascripts/widgets/tab_caching_widget.js index ad69798ae..f832de9f1 100644 --- a/src/public/javascripts/widgets/tab_caching_widget.js +++ b/src/public/javascripts/widgets/tab_caching_widget.js @@ -40,13 +40,13 @@ export default class TabCachingWidget extends TabAwareWidget { if (!widget) { widget = this.widgets[this.tabContext.tabId] = this.widgetFactory(); - this.child(widget); const $renderedWidget = widget.render(); - keyboardActionsService.updateDisplayedShortcuts($renderedWidget); - this.$widget.after($renderedWidget); + keyboardActionsService.updateDisplayedShortcuts($renderedWidget); + + this.child(widget); // add as child only once it is ready (also rendered) widget.handleEvent('setTabContext', {tabContext: this.tabContext}); } diff --git a/src/public/javascripts/widgets/type_widgets/book.js b/src/public/javascripts/widgets/type_widgets/book.js index c08dc5c4f..f2ff9301b 100644 --- a/src/public/javascripts/widgets/type_widgets/book.js +++ b/src/public/javascripts/widgets/type_widgets/book.js @@ -293,15 +293,7 @@ export default class BookTypeWidget extends TypeWidget { } } - getContent() {} - - focus() {} - cleanup() { this.$content.empty(); } - - scrollToTop() { - this.$widget.scrollTop(0); - } } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/code.js b/src/public/javascripts/widgets/type_widgets/code.js index f50abd5fd..688ce20a6 100644 --- a/src/public/javascripts/widgets/type_widgets/code.js +++ b/src/public/javascripts/widgets/type_widgets/code.js @@ -132,8 +132,4 @@ export default class CodeTypeWidget extends TypeWidget { }); } } - - scrollToTop() { - this.$widget.scrollTop(0); - } } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/empty.js b/src/public/javascripts/widgets/type_widgets/empty.js index e6df0effa..d5ebda060 100644 --- a/src/public/javascripts/widgets/type_widgets/empty.js +++ b/src/public/javascripts/widgets/type_widgets/empty.js @@ -38,12 +38,4 @@ export default class EmptyTypeWidget extends TypeWidget { doRefresh(note) { this.$autoComplete.trigger('focus'); } - - getContent() {} - - focus() {} - - cleanup() {} - - scrollToTop() {} } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/file.js b/src/public/javascripts/widgets/type_widgets/file.js index ac84fc6ed..99c8c7ef2 100644 --- a/src/public/javascripts/widgets/type_widgets/file.js +++ b/src/public/javascripts/widgets/type_widgets/file.js @@ -144,12 +144,4 @@ export default class FileTypeWidget extends TypeWidget { getFileUrl() { return utils.getUrlForDownload("api/notes/" + this.noteId + "/download"); } - - getContent() {} - - focus() {} - - cleanup() {} - - scrollToTop() {} } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/image.js b/src/public/javascripts/widgets/type_widgets/image.js index 12be5bdd0..c5a87c84f 100644 --- a/src/public/javascripts/widgets/type_widgets/image.js +++ b/src/public/javascripts/widgets/type_widgets/image.js @@ -147,16 +147,6 @@ class ImageTypeWidget extends TypeWidget { getFileUrl() { return utils.getUrlForDownload(`api/notes/${this.noteId}/download`); } - - getContent() {} - - focus() {} - - cleanup() {} - - scrollToTop() { - this.$widget.scrollTop(0); - } } export default ImageTypeWidget \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/protected_session.js b/src/public/javascripts/widgets/type_widgets/protected_session.js index f7760f893..487933ec3 100644 --- a/src/public/javascripts/widgets/type_widgets/protected_session.js +++ b/src/public/javascripts/widgets/type_widgets/protected_session.js @@ -39,14 +39,4 @@ export default class ProtectedSessionTypeWidget extends TypeWidget { return this.$widget; } - - getContent() {} - - focus() {} - - cleanup() {} - - scrollToTop() { - this.$widget.scrollTop(0); - } } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/relation_map.js b/src/public/javascripts/widgets/type_widgets/relation_map.js index 5114d17b3..809b76f86 100644 --- a/src/public/javascripts/widgets/type_widgets/relation_map.js +++ b/src/public/javascripts/widgets/type_widgets/relation_map.js @@ -640,8 +640,4 @@ export default class RelationMapTypeWidget extends TypeWidget { getContent() { return JSON.stringify(this.mapData); } - - focus() {} - - scrollToTop() {} } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/render.js b/src/public/javascripts/widgets/type_widgets/render.js index 342ccb347..3051c1775 100644 --- a/src/public/javascripts/widgets/type_widgets/render.js +++ b/src/public/javascripts/widgets/type_widgets/render.js @@ -37,15 +37,7 @@ export default class RenderTypeWidget extends TypeWidget { } } - getContent() {} - - focus() {} - cleanup() { this.$noteDetailRenderContent.empty(); } - - scrollToTop() { - this.$widget.scrollTop(0); - } } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/search.js b/src/public/javascripts/widgets/type_widgets/search.js index 93e08bfd1..8b2f0ad94 100644 --- a/src/public/javascripts/widgets/type_widgets/search.js +++ b/src/public/javascripts/widgets/type_widgets/search.js @@ -48,10 +48,4 @@ export default class SearchTypeWidget extends TypeWidget { searchString: this.$searchString.val() }); } - - focus() {} - - cleanup() {} - - scrollToTop() {} } \ No newline at end of file diff --git a/src/public/javascripts/widgets/type_widgets/text.js b/src/public/javascripts/widgets/type_widgets/text.js index c5be273ec..8dc602077 100644 --- a/src/public/javascripts/widgets/type_widgets/text.js +++ b/src/public/javascripts/widgets/type_widgets/text.js @@ -186,10 +186,6 @@ export default class TextTypeWidget extends TypeWidget { } } - scrollToTop() { - this.$widget.scrollTop(0); - } - insertDateTimeToTextCommand() { const date = new Date(); const dateString = utils.formatDateTime(date); diff --git a/src/public/javascripts/widgets/type_widgets/type_widget.js b/src/public/javascripts/widgets/type_widgets/type_widget.js index c1b37c327..7e7e6cd41 100644 --- a/src/public/javascripts/widgets/type_widgets/type_widget.js +++ b/src/public/javascripts/widgets/type_widgets/type_widget.js @@ -28,4 +28,12 @@ export default class TypeWidget extends TabAwareWidget { isActive() { return this.$widget.is(":visible"); } + + getContent() {} + + focus() {} + + scrollToTop() { + this.$widget.scrollTop(0); + } } \ No newline at end of file