diff --git a/src/components/Autocomplete.vue b/src/components/Autocomplete.vue index be176b030046ffa5d8507b32b28ef120760c6e34..b33b38f169df5c8b2006c3cae2e2e2cdb4d02e7b 100644 --- a/src/components/Autocomplete.vue +++ b/src/components/Autocomplete.vue @@ -32,7 +32,7 @@ <a href="#result0" class="accessibility_link" tabindex="0">Gå til hovedinnhold</a> </div> <a href="#top_menu" class="accessibility_link" - @click="$store.commit('toggle', 'menuOpen')" + @click="$store.commit('toggleMenu')" aria-label="Hopp til toppmeny" > diff --git a/src/components/Menu.vue b/src/components/Menu.vue index b875141484b34b76dbb9e6558bcf079ba5a4aa4d..40148bb7b1ed4ec18485ad413513644f8ee0892b 100644 --- a/src/components/Menu.vue +++ b/src/components/Menu.vue @@ -100,12 +100,5 @@ export default { } } }, - watch: { - $route(to, from) { - if (to.name == "about" && from.name != to.name) { - this.$store.commit('toggle', 'aboutOpen') - } - } - } } </script> diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue index 7c8b2630bf8a445d91683792ffb3d46472cfa095..ecf4657182f9c73851c9b281117a10c920cf767c 100644 --- a/src/components/TopBar.vue +++ b/src/components/TopBar.vue @@ -6,7 +6,7 @@ <v-spacer/> <v-divider vertical/> <v-toolbar-items v-if="$route.name == 'about'"> - <v-btn text @click.native="back" v-if="$store.state.aboutOpen">{{$t('close')}}<v-icon right>close</v-icon></v-btn> + <v-btn text @click.native="back" v-if="$route.name == 'about'">{{$t('close')}}<v-icon right>close</v-icon></v-btn> <v-btn text v-else @click.native="home">Søk i ordbøkene<v-icon right>search</v-icon></v-btn> </v-toolbar-items> <v-toolbar-items> @@ -40,7 +40,6 @@ export default { return { version_label: process.env.VUE_APP_VERSION_LABEL, release: process.env.VUE_APP_RELEASE, - settingsMenu: false } }, computed: { @@ -49,7 +48,7 @@ export default { return this.$store.state.menuOpen }, set () { - this.$store.commit('toggle', 'menuOpen') + this.$store.commit('toggleMenu') } } }, @@ -59,7 +58,6 @@ export default { }, back: function() { this.$router.go(-1) - this.$store.commit('toggle', 'aboutOpen') } }, diff --git a/src/main.js b/src/main.js index 7ba7a3c50f29373e1751731aa91252d3dc13ada4..18159b08b7cd2b5e0bc5814279c5842cd44f8e98 100644 --- a/src/main.js +++ b/src/main.js @@ -95,9 +95,6 @@ const store = new Vuex.Store({ menuOpen: false, noMouse: null, searchRoute: null, - aboutOpen: false - - }, mutations: { initStore(state) { @@ -126,6 +123,9 @@ const store = new Vuex.Store({ state[setting] = value localStorage.setItem(setting, value); }, + toggleMenu(state) { + state.menuOpen = !state.menuOpen + }, setDefaultDict(state, value) { localStorage.setItem("defaultDict", value) state.defaultDict = value @@ -135,6 +135,7 @@ const store = new Vuex.Store({ localStorage.removeItem("showInflectionNo") localStorage.removeItem("currentLocale") localStorage.removeItem("collapseArticles") + localStorage.removeItem("defaultDict") this.commit("initStore") }, setSearchRoute(state, path) {