diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 19:23:52 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 19:23:52 +0900 |
| commit | 48d540e9f4cb820ab21c2a33eb68267442bea96b (patch) | |
| tree | b89bcb2041b86804a5a99080d0d4c67a79b24d3b /src | |
| parent | Fix bug (diff) | |
| download | sharkey-48d540e9f4cb820ab21c2a33eb68267442bea96b.tar.gz sharkey-48d540e9f4cb820ab21c2a33eb68267442bea96b.tar.bz2 sharkey-48d540e9f4cb820ab21c2a33eb68267442bea96b.zip | |
Fix bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/common/views/filters/user.ts | 4 | ||||
| -rw-r--r-- | src/client/app/desktop/script.ts | 2 | ||||
| -rw-r--r-- | src/client/app/mobile/script.ts | 2 | ||||
| -rw-r--r-- | src/client/app/mobile/views/pages/user.vue | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/client/app/common/views/filters/user.ts b/src/client/app/common/views/filters/user.ts index 167bb7758a..c5bb39f674 100644 --- a/src/client/app/common/views/filters/user.ts +++ b/src/client/app/common/views/filters/user.ts @@ -10,6 +10,6 @@ Vue.filter('userName', user => { return getUserName(user); }); -Vue.filter('userPage', user => { - return '/@' + Vue.filter('acct')(user); +Vue.filter('userPage', (user, path?) => { + return '/@' + Vue.filter('acct')(user) + (path ? '/' + path : ''); }); diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index f57d42aa6f..b3152e708b 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -57,7 +57,7 @@ init(async (launch) => { { path: '/othello', component: MkOthello }, { path: '/othello/:game', component: MkOthello }, { path: '/@:user', component: MkUser }, - { path: '/@:user/:note', component: MkNote } + { path: '/notes/:note', component: MkNote } ] }); diff --git a/src/client/app/mobile/script.ts b/src/client/app/mobile/script.ts index 6265d0d45f..1de4891973 100644 --- a/src/client/app/mobile/script.ts +++ b/src/client/app/mobile/script.ts @@ -68,7 +68,7 @@ init((launch) => { { path: '/@:user', component: MkUser }, { path: '/@:user/followers', component: MkFollowers }, { path: '/@:user/following', component: MkFollowing }, - { path: '/@:user/:note', component: MkNote } + { path: '/notes/:note', component: MkNote } ] }); diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue index f650f8aa82..d30fae7ba1 100644 --- a/src/client/app/mobile/views/pages/user.vue +++ b/src/client/app/mobile/views/pages/user.vue @@ -30,11 +30,11 @@ <b>{{ user.notesCount | number }}</b> <i>%i18n:mobile.tags.mk-user.notes%</i> </a> - <a :href="`${user | userPage}/following`"> + <a :href="user | userPage('following')"> <b>{{ user.followingCount | number }}</b> <i>%i18n:mobile.tags.mk-user.following%</i> </a> - <a :href="`${user | userPage}/followers`"> + <a :href="user | userPage('followers')"> <b>{{ user.followersCount | number }}</b> <i>%i18n:mobile.tags.mk-user.followers%</i> </a> |