summaryrefslogtreecommitdiff
path: root/src/client/app/desktop/views/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-01-16 14:54:14 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-01-16 14:54:14 +0900
commit13cee2b4f56adaf328c2da5c744a9bef5c9185e6 (patch)
tree7d774b76508cea3d3b51f8529d7b68bcd8f7b97a /src/client/app/desktop/views/components
parent[Client] Resolve #3895 (diff)
downloadmisskey-13cee2b4f56adaf328c2da5c744a9bef5c9185e6.tar.gz
misskey-13cee2b4f56adaf328c2da5c744a9bef5c9185e6.tar.bz2
misskey-13cee2b4f56adaf328c2da5c744a9bef5c9185e6.zip
Resolve #3896
Diffstat (limited to 'src/client/app/desktop/views/components')
-rw-r--r--src/client/app/desktop/views/components/timeline.vue6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/client/app/desktop/views/components/timeline.vue b/src/client/app/desktop/views/components/timeline.vue
index dfcac31a7f..edeb30d9cd 100644
--- a/src/client/app/desktop/views/components/timeline.vue
+++ b/src/client/app/desktop/views/components/timeline.vue
@@ -4,7 +4,7 @@
<span :data-active="src == 'home'" @click="src = 'home'"><fa icon="home"/> {{ $t('home') }}</span>
<span :data-active="src == 'local'" @click="src = 'local'" v-if="enableLocalTimeline"><fa :icon="['far', 'comments']"/> {{ $t('local') }}</span>
<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
- <span :data-active="src == 'global'" @click="src = 'global'"><fa icon="globe"/> {{ $t('global') }}</span>
+ <span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
<span :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</span>
<span :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.title }}</span>
<div class="buttons">
@@ -43,7 +43,8 @@ export default Vue.extend({
src: 'home',
list: null,
tagTl: null,
- enableLocalTimeline: false
+ enableLocalTimeline: false,
+ enableGlobalTimeline: false,
};
},
@@ -66,6 +67,7 @@ export default Vue.extend({
created() {
this.$root.getMeta().then(meta => {
this.enableLocalTimeline = !meta.disableLocalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin;
+ this.enableGlobalTimeline = !meta.disableGlobalTimeline || this.$store.state.i.isModerator || this.$store.state.i.isAdmin;
});
if (this.$store.state.device.tl) {