diff options
| author | shpuld <shpuld@gmail.com> | 2017-03-06 14:51:01 +0200 |
|---|---|---|
| committer | shpuld <shpuld@gmail.com> | 2017-03-06 14:51:01 +0200 |
| commit | 31c0a2dfef565bc665ebe6c4d8102249eefc6869 (patch) | |
| tree | 6f24d32bf47634aa9f4d81c6041e18dd39fe1f3c /src/main.js | |
| parent | e19bfb9a22f1db562de7079b71dee6e53a8a54fb (diff) | |
| parent | 67c22276d3049576bebeaf4d22e937d759cba06d (diff) | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading
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 } } }) |