From 7ec20f9384743934762147b0477493fc2d4b5c9a Mon Sep 17 00:00:00 2001 From: zadam Date: Tue, 26 Oct 2021 20:14:56 +0200 Subject: [PATCH] fix refreshing ribbon titles upon entity change, closes #2274 --- src/public/app/widgets/containers/ribbon_container.js | 8 ++++---- .../app/widgets/ribbon_widgets/promoted_attributes.js | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/public/app/widgets/containers/ribbon_container.js b/src/public/app/widgets/containers/ribbon_container.js index ac192f35c..de2fa37ed 100644 --- a/src/public/app/widgets/containers/ribbon_container.js +++ b/src/public/app/widgets/containers/ribbon_container.js @@ -1,5 +1,6 @@ import NoteContextAwareWidget from "../note_context_aware_widget.js"; import keyboardActionsService from "../../services/keyboard_actions.js"; +import attributeService from "../../services/attributes.js"; const TPL = `
@@ -261,10 +262,6 @@ export default class RibbonContainer extends NoteContextAwareWidget { return $ribbonComponent.hasClass("active"); } - refreshRibbonContainerCommand() { - this.refreshWithNote(this.note, true); - } - ensureOwnedAttributesAreOpen(ntxId) { if (this.isNoteContext(ntxId) && !this.isRibbonTabActive('ownedAttributes')) { this.toggleRibbonTabWithName('ownedAttributes', ntxId); @@ -332,6 +329,9 @@ export default class RibbonContainer extends NoteContextAwareWidget { this.refresh(); } + else if (loadResults.getAttributes(this.componentId).find(attr => attributeService.isAffecting(attr, this.note))) { + this.refreshWithNote(this.note, true); + } } getActiveRibbonWidget() { diff --git a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js index dab794ae8..0fea1a4a8 100644 --- a/src/public/app/widgets/ribbon_widgets/promoted_attributes.js +++ b/src/public/app/widgets/ribbon_widgets/promoted_attributes.js @@ -297,9 +297,6 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget { entitiesReloadedEvent({loadResults}) { if (loadResults.getAttributes(this.componentId).find(attr => attributeService.isAffecting(attr, this.note))) { this.refresh(); - - this.getTitle(this.note); - this.triggerCommand('refreshRibbonContainer'); } } }