From 8cfa31256e2b1114efd3ab75eb008ccbe1556136 Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Tue, 17 Apr 2018 09:15:55 +0900 Subject: [PATCH] fix: Close side bar when user change account --- src/renderer/components/TimelineSpace/Contents/SideBar.vue | 3 +++ src/renderer/store/TimelineSpace/Contents/SideBar.js | 3 ++- .../store/TimelineSpace/Contents/SideBar/AccountProfile.js | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/renderer/components/TimelineSpace/Contents/SideBar.vue b/src/renderer/components/TimelineSpace/Contents/SideBar.vue index ba430211b2..f34b278d90 100644 --- a/src/renderer/components/TimelineSpace/Contents/SideBar.vue +++ b/src/renderer/components/TimelineSpace/Contents/SideBar.vue @@ -33,6 +33,9 @@ export default { } }) }, + beforeDestroy () { + this.close() + }, methods: { close () { this.$store.dispatch('TimelineSpace/Contents/SideBar/close') diff --git a/src/renderer/store/TimelineSpace/Contents/SideBar.js b/src/renderer/store/TimelineSpace/Contents/SideBar.js index cf5c19ea6d..ce59039640 100644 --- a/src/renderer/store/TimelineSpace/Contents/SideBar.js +++ b/src/renderer/store/TimelineSpace/Contents/SideBar.js @@ -23,7 +23,8 @@ const SideBar = { } }, actions: { - close ({ commit }) { + close ({ dispatch, commit }) { + dispatch('TimelineSpace/Contents/SideBar/AccountProfile/close', {}, { root: true }) commit('changeOpenSideBar', false) commit('changeComponent', 0) }, diff --git a/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js index f666caa482..8b0ecb840f 100644 --- a/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js +++ b/src/renderer/store/TimelineSpace/Contents/SideBar/AccountProfile.js @@ -77,6 +77,9 @@ const AccountProfile = { resolve(res) }) }) + }, + close ({ commit }) { + commit('changeAccount', null) } } }