diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:00:09 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-03-09 09:00:09 +0100 |
| commit | b11c1f57a95e689a751c4dff72ebe7aabc9c0601 (patch) | |
| tree | b2596b07c3482c76493cc61974932cdf33e296ab /src/main.js | |
| parent | 502757da28d573641a48197c284b7e40dfc8154e (diff) | |
| parent | ba4f7ef3efe15aaebce523113283b5854d16ceb8 (diff) | |
Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading
Diffstat (limited to 'src/main.js')
| -rw-r--r-- | src/main.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.js b/src/main.js index fa0a872f..30929f0b 100644 --- a/src/main.js +++ b/src/main.js @@ -53,7 +53,7 @@ const routes = [ { path: '/main/all', component: PublicAndExternalTimeline }, { path: '/main/public', component: PublicTimeline }, { path: '/main/friends', component: FriendsTimeline }, - { name: 'conversation', path: '/notice/:id', component: ConversationPage }, + { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } }, { name: 'user-profile', path: '/users/:id', component: UserProfile }, { name: 'mentions', path: '/:username/mentions', component: Mentions }, { name: 'settings', path: '/settings', component: Settings } @@ -63,6 +63,9 @@ const router = new VueRouter({ mode: 'history', routes, scrollBehavior: (to, from, savedPosition) => { + if (to.matched.some(m => m.meta.dontScroll)) { + return false + } return savedPosition || { x: 0, y: 0 } } }) |