From 22e8258a56ab0828231bc0e510b52dd39eebb5c7 Mon Sep 17 00:00:00 2001
From: wakarimasen <wakarimasen@airmail.cc>
Date: Sun, 5 Mar 2017 11:56:28 +0100
Subject: Highlight current notice in conversation-page, add backlinks

---
 src/main.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main.js')

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 }
   }
 })
-- 
cgit v1.2.3-70-g09d2


From 0bb1ec30d0ccba0fded1c6555d75297a6d9c83d2 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 6 Mar 2017 19:55:08 +0100
Subject: Temporarily remove persistence.

---
 src/main.js | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index 30929f0b..b448510e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,6 @@ import configModule from './modules/config.js'
 
 import VueTimeago from 'vue-timeago'
 
-import createPersistedState from './lib/persisted_state.js'
-
 Vue.use(Vuex)
 Vue.use(VueRouter)
 Vue.use(VueTimeago, {
@@ -28,15 +26,6 @@ Vue.use(VueTimeago, {
   }
 })
 
-const persistedStateOptions = {
-  paths: [
-    'config.hideAttachments',
-    'config.hideNsfw',
-    'statuses.notifications',
-    'users.users'
-  ]
-}
-
 const store = new Vuex.Store({
   modules: {
     statuses: statusesModule,
@@ -44,7 +33,6 @@ const store = new Vuex.Store({
     api: apiModule,
     config: configModule
   },
-  plugins: [createPersistedState(persistedStateOptions)],
   strict: process.env.NODE_ENV !== 'production'
 })
 
-- 
cgit v1.2.3-70-g09d2


From 990047725a4f6c7bbda1e7519a605b1ae1ece51e Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 6 Mar 2017 19:57:00 +0100
Subject: Revert "Temporarily remove persistence."

This reverts commit 0bb1ec30d0ccba0fded1c6555d75297a6d9c83d2.
---
 src/main.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index b448510e..30929f0b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,6 +17,8 @@ import configModule from './modules/config.js'
 
 import VueTimeago from 'vue-timeago'
 
+import createPersistedState from './lib/persisted_state.js'
+
 Vue.use(Vuex)
 Vue.use(VueRouter)
 Vue.use(VueTimeago, {
@@ -26,6 +28,15 @@ Vue.use(VueTimeago, {
   }
 })
 
+const persistedStateOptions = {
+  paths: [
+    'config.hideAttachments',
+    'config.hideNsfw',
+    'statuses.notifications',
+    'users.users'
+  ]
+}
+
 const store = new Vuex.Store({
   modules: {
     statuses: statusesModule,
@@ -33,6 +44,7 @@ const store = new Vuex.Store({
     api: apiModule,
     config: configModule
   },
+  plugins: [createPersistedState(persistedStateOptions)],
   strict: process.env.NODE_ENV !== 'production'
 })
 
-- 
cgit v1.2.3-70-g09d2