From a46c0c3b21b88562681f99311eb72b8d351bf834 Mon Sep 17 00:00:00 2001 From: djmaze Date: Wed, 17 Mar 2021 10:09:10 +0100 Subject: [PATCH] Put AppUserStore.currentAudio in AbstractSystemDropDownUserView --- dev/Stores/User/App.js | 2 -- dev/View/User/AbstractSystemDropDown.js | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js index 046a085a5..5600e6d61 100644 --- a/dev/Stores/User/App.js +++ b/dev/Stores/User/App.js @@ -8,8 +8,6 @@ export const AppUserStore = { }; addObservablesTo(AppUserStore, { - currentAudio: '', - focusedState: Scope.None, threadsAllowed: false, diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/AbstractSystemDropDown.js index 51c13641d..06ce76fe2 100644 --- a/dev/View/User/AbstractSystemDropDown.js +++ b/dev/View/User/AbstractSystemDropDown.js @@ -23,8 +23,6 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { this.allowSettings = Settings.capa(Capa.Settings); this.allowHelp = Settings.capa(Capa.Help); - this.currentAudio = AppUserStore.currentAudio; - this.accountEmail = AccountUserStore.email; this.accounts = AccountUserStore.accounts; @@ -32,6 +30,7 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { this.accountsUnreadCount = AccountUserStore.accountsUnreadCount; this.addObservables({ + currentAudio: '', accountMenuDropdownTrigger: false, capaAdditionalAccounts: Settings.capa(Capa.AdditionalAccounts) }); @@ -40,8 +39,8 @@ export class AbstractSystemDropDownUserView extends AbstractViewRight { this.addAccountClick = this.addAccountClick.bind(this); - addEventListener('audio.stop', () => AppUserStore.currentAudio('')); - addEventListener('audio.start', e => AppUserStore.currentAudio(e.detail)); + addEventListener('audio.stop', () => this.currentAudio('')); + addEventListener('audio.start', e => this.currentAudio(e.detail)); } stopPlay() {