From 9f1e777e6df7db30afd426ebff280346e7155ceb Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 19 Jan 2020 11:37:24 +0100 Subject: [PATCH] introduction of refreshWithNote --- src/public/javascripts/desktop.js | 2 +- src/public/javascripts/widgets/attributes.js | 2 +- .../javascripts/widgets/basic_widget.js | 4 +++ src/public/javascripts/widgets/calendar.js | 2 +- .../javascripts/widgets/edited_notes.js | 2 +- src/public/javascripts/widgets/link_map.js | 2 +- src/public/javascripts/widgets/note_info.js | 2 +- src/public/javascripts/widgets/note_paths.js | 2 +- .../javascripts/widgets/note_revisions.js | 2 +- src/public/javascripts/widgets/note_title.js | 10 +----- src/public/javascripts/widgets/note_type.js | 33 +++++++++---------- .../widgets/promoted_attributes.js | 7 +--- .../javascripts/widgets/similar_notes.js | 2 +- .../javascripts/widgets/tab_aware_widget.js | 13 ++++++-- .../javascripts/widgets/tab_caching_widget.js | 6 ++++ .../javascripts/widgets/what_links_here.js | 2 +- 16 files changed, 49 insertions(+), 44 deletions(-) diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js index 64c7a15a9..9ba8c3601 100644 --- a/src/public/javascripts/desktop.js +++ b/src/public/javascripts/desktop.js @@ -60,7 +60,7 @@ window.glob.noteChanged = noteDetailService.noteChanged; window.glob.refreshTree = treeService.reload; // required for ESLint plugin -window.glob.getActiveTabNote = appContext.getActiveTabNote; +window.glob.getActiveTabNote = () => appContext.getActiveTabNote(); window.glob.requireLibrary = libraryLoader.requireLibrary; window.glob.ESLINT = libraryLoader.ESLINT; diff --git a/src/public/javascripts/widgets/attributes.js b/src/public/javascripts/widgets/attributes.js index 5e8282535..9505b9757 100644 --- a/src/public/javascripts/widgets/attributes.js +++ b/src/public/javascripts/widgets/attributes.js @@ -23,7 +23,7 @@ class AttributesWidget extends StandardWidget { return [$showFullButton]; } - async refresh() { + async refreshWithNote() { const attributes = await this.tabContext.attributes.getAttributes();console.log("attributes", attributes); const ownedAttributes = attributes.filter(attr => attr.noteId === this.tabContext.note.noteId); diff --git a/src/public/javascripts/widgets/basic_widget.js b/src/public/javascripts/widgets/basic_widget.js index 4c2df5cb5..5c1fd5f7c 100644 --- a/src/public/javascripts/widgets/basic_widget.js +++ b/src/public/javascripts/widgets/basic_widget.js @@ -17,6 +17,10 @@ class BasicWidget extends Component { doRender() {} toggle(show) { + if (!this.$widget) { + console.log(this.componentId); + } + this.$widget.toggle(show); } diff --git a/src/public/javascripts/widgets/calendar.js b/src/public/javascripts/widgets/calendar.js index 4f6ecc9a6..3bd20ed4f 100644 --- a/src/public/javascripts/widgets/calendar.js +++ b/src/public/javascripts/widgets/calendar.js @@ -38,7 +38,7 @@ class CalendarWidget extends StandardWidget { this.$body.html(TPL); } - async refresh() { + async refreshWithNote() { this.init(this.$body, await this.tabContext.note.getLabelValue("dateNote")); } diff --git a/src/public/javascripts/widgets/edited_notes.js b/src/public/javascripts/widgets/edited_notes.js index 9995d5407..09ec0f5e4 100644 --- a/src/public/javascripts/widgets/edited_notes.js +++ b/src/public/javascripts/widgets/edited_notes.js @@ -19,7 +19,7 @@ class EditedNotesWidget extends StandardWidget { && await this.tabContext.note.hasLabel("dateNote"); } - async doRenderBody() { + async refreshWithNote() { const note = this.tabContext.note; // remember which title was when we found the similar notes this.title = note.title; diff --git a/src/public/javascripts/widgets/link_map.js b/src/public/javascripts/widgets/link_map.js index 9ef32b929..fd5ebc3fd 100644 --- a/src/public/javascripts/widgets/link_map.js +++ b/src/public/javascripts/widgets/link_map.js @@ -28,7 +28,7 @@ class LinkMapWidget extends StandardWidget { return [$showFullButton]; } - async refresh() { + async refreshWithNote() { this.$body.css('opacity', 0); this.$body.html(TPL); diff --git a/src/public/javascripts/widgets/note_info.js b/src/public/javascripts/widgets/note_info.js index 1e52741a4..cc1f392ec 100644 --- a/src/public/javascripts/widgets/note_info.js +++ b/src/public/javascripts/widgets/note_info.js @@ -31,7 +31,7 @@ class NoteInfoWidget extends StandardWidget { this.$body.html(TPL); } - refresh() { + refreshWithNote() { const $noteId = this.$body.find(".note-info-note-id"); const $dateCreated = this.$body.find(".note-info-date-created"); const $dateModified = this.$body.find(".note-info-date-modified"); diff --git a/src/public/javascripts/widgets/note_paths.js b/src/public/javascripts/widgets/note_paths.js index 6ca12b316..893282358 100644 --- a/src/public/javascripts/widgets/note_paths.js +++ b/src/public/javascripts/widgets/note_paths.js @@ -30,7 +30,7 @@ export default class NotePathsWidget extends TabAwareWidget { return this.$widget; } - async refresh() { + async refreshWithNote() { const {note, notePath} = this.tabContext; if (note.noteId === 'root') { diff --git a/src/public/javascripts/widgets/note_revisions.js b/src/public/javascripts/widgets/note_revisions.js index fdcdd7aa2..fdbff4f17 100644 --- a/src/public/javascripts/widgets/note_revisions.js +++ b/src/public/javascripts/widgets/note_revisions.js @@ -26,7 +26,7 @@ class NoteRevisionsWidget extends StandardWidget { return [$showFullButton]; } - async refresh() { + async refreshWithNote() { const note = this.tabContext.note; const revisionItems = await server.get(`notes/${note.noteId}/revisions`); diff --git a/src/public/javascripts/widgets/note_title.js b/src/public/javascripts/widgets/note_title.js index 3ba0f53b4..840f0cd70 100644 --- a/src/public/javascripts/widgets/note_title.js +++ b/src/public/javascripts/widgets/note_title.js @@ -130,17 +130,9 @@ export default class NoteTitleWidget extends TabAwareWidget { return this.$widget; } - async refresh() { + async refreshWithNote() { const note = this.tabContext.note; - if (!note) { - this.toggle(false); - return; - } - else { - this.toggle(true); - } - this.$noteTitle.val(note.title); if (note.isProtected && !protectedSessionHolder.isProtectedSessionAvailable()) { diff --git a/src/public/javascripts/widgets/note_type.js b/src/public/javascripts/widgets/note_type.js index 59d01c585..bcd06ad40 100644 --- a/src/public/javascripts/widgets/note_type.js +++ b/src/public/javascripts/widgets/note_type.js @@ -17,15 +17,14 @@ const NOTE_TYPES = [ ]; const TPL = ` - -