Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid the "duplicated promise" error which comes from the vue-router #272

Merged
merged 1 commit into from
Apr 23, 2020
Merged

avoid the "duplicated promise" error which comes from the vue-router #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/PageNavigator/PageNavigator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
$route.matched.map(({path}) => path).includes(route.path) ? 'active' : '',
!currentAccount ? 'un_click' : '',
]"
@click="!currentAccount ? '' : $router.push({name: route.name})"
@click="onPageNavigate(route)"
>
<div class="navigator-icon-container">
<img :src="route.meta.icon" class="navigator-icon">
Expand Down
6 changes: 6 additions & 0 deletions src/components/PageNavigator/PageNavigatorTs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {Component, Vue} from 'vue-property-decorator'
import {mapGetters} from 'vuex'
// internal dependencies
import {AccountModel} from '@/core/database/entities/AccountModel'
import { Route } from 'vue-router'

@Component({
computed: {
Expand All @@ -41,4 +42,9 @@ export class PageNavigatorTs extends Vue {
await this.$store.dispatch('account/LOG_OUT')
this.$router.push({name: 'accounts.login'})
}

public onPageNavigate(route: Route) {
const isDuplicatedRoute = this.$route.matched.map(({ path }) => path).includes(route.path)
!isDuplicatedRoute && this.currentAccount && this.$router.push({ name: route.name }).catch(() => {/**/ })
}
}