diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-09-06 04:28:42 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-09-06 04:28:42 +0900 |
| commit | ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7 (patch) | |
| tree | c313e84c98b54934ef0f24922610ff5e0f60a751 /src/client/app/common | |
| parent | Improve welcome page (diff) | |
| parent | Show host in local user detail (#2634) (diff) | |
| download | sharkey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.tar.gz sharkey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.tar.bz2 sharkey-ccf8e44acc8b4bcdb19895ce60cd86d699efcbf7.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/client/app/common')
| -rw-r--r-- | src/client/app/common/scripts/gcd.ts | 2 | ||||
| -rw-r--r-- | src/client/app/common/views/components/acct.vue | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/client/app/common/scripts/gcd.ts b/src/client/app/common/scripts/gcd.ts deleted file mode 100644 index 9a19f9da66..0000000000 --- a/src/client/app/common/scripts/gcd.ts +++ /dev/null @@ -1,2 +0,0 @@ -const gcd = (a, b) => !b ? a : gcd(b, a % b); -export default gcd; diff --git a/src/client/app/common/views/components/acct.vue b/src/client/app/common/views/components/acct.vue index 1ad222afdd..2b5efe609c 100644 --- a/src/client/app/common/views/components/acct.vue +++ b/src/client/app/common/views/components/acct.vue @@ -1,14 +1,20 @@ <template> <span class="mk-acct"> <span class="name">@{{ user.username }}</span> - <span class="host" v-if="user.host">@{{ user.host }}</span> + <span class="host" v-if="user.host || detail">@{{ user.host || host }}</span> </span> </template> <script lang="ts"> import Vue from 'vue'; +import { host } from '../../../config'; export default Vue.extend({ - props: ['user'] + props: ['user', 'detail'], + data() { + return { + host + }; + } }); </script> |