diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-03-05 14:59:33 -0500 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-03-05 14:59:33 -0500 |
| commit | 67c22276d3049576bebeaf4d22e937d759cba06d (patch) | |
| tree | 6c28fb8ddee63c061a8fa01ab35ecf338803b50c /src/main.js | |
| parent | 049c74f8e87e0aa19ee416bb72c987296a3e2dc9 (diff) | |
| parent | 51160f0fdb068f0c9a1133fe66286467b1f4fd78 (diff) | |
Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop'
Wakarimasen/pleroma fe highlight notice
See merge request !41
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 } } }) |