diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-02-17 23:40:00 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-17 23:40:00 +0900 |
| commit | 03e2c7eec60df3d03b0ba340263bb9ec6c94309d (patch) | |
| tree | 7b17029f4a3417fd99acc4c8fdbdb0dd3524cc74 /src/client/app/desktop | |
| parent | Update @types/node requirement from 10.12.21 to 10.12.24 (#4231) (diff) | |
| download | sharkey-03e2c7eec60df3d03b0ba340263bb9ec6c94309d.tar.gz sharkey-03e2c7eec60df3d03b0ba340263bb9ec6c94309d.tar.bz2 sharkey-03e2c7eec60df3d03b0ba340263bb9ec6c94309d.zip | |
Fix #4300 (#4304)
* Fix #4300
* sidebar
Diffstat (limited to 'src/client/app/desktop')
| -rw-r--r-- | src/client/app/desktop/script.ts | 3 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/ui.header.account.vue | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/ui.sidebar.vue | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 6957f34d75..c66171e3af 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -126,7 +126,8 @@ init(async (launch, os) => { os.store.commit('device/set', { key: 'inDeckMode', - value: os.store.getters.isSignedIn && os.store.state.device.deckMode && document.location.pathname === '/' + value: os.store.getters.isSignedIn && os.store.state.device.deckMode + && (document.location.pathname === '/' || window.performance.navigation.type === 1) }); // Init router diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index 37983285c4..1326055048 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -166,7 +166,7 @@ export default Vue.extend({ }, toggleDeckMode() { this.$store.commit('device/set', { key: 'deckMode', value: !this.$store.state.device.inDeckMode }); - location.reload(); + location.replace('/'); }, } }); diff --git a/src/client/app/desktop/views/components/ui.sidebar.vue b/src/client/app/desktop/views/components/ui.sidebar.vue index c404d03a12..a0fca81021 100644 --- a/src/client/app/desktop/views/components/ui.sidebar.vue +++ b/src/client/app/desktop/views/components/ui.sidebar.vue @@ -122,7 +122,7 @@ export default Vue.extend({ methods: { toggleDeckMode(deck) { this.$store.commit('device/set', { key: 'deckMode', value: deck }); - location.reload(); + location.replace('/'); }, onReversiInvited() { |