diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-04-08 23:05:41 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-04-08 23:05:41 +0900 |
| commit | 87d3a06dcd6a76120789c050dd6a0c7111bf7224 (patch) | |
| tree | ec0035b3284c30459033e97fbdc986b5cb5cf430 /src/client/app/common/views/deck | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-87d3a06dcd6a76120789c050dd6a0c7111bf7224.tar.gz sharkey-87d3a06dcd6a76120789c050dd6a0c7111bf7224.tar.bz2 sharkey-87d3a06dcd6a76120789c050dd6a0c7111bf7224.zip | |
revert rename
Diffstat (limited to 'src/client/app/common/views/deck')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/client/app/common/views/deck/deck.column-core.vue b/src/client/app/common/views/deck/deck.column-core.vue index e3f92dea16..974c58235d 100644 --- a/src/client/app/common/views/deck/deck.column-core.vue +++ b/src/client/app/common/views/deck/deck.column-core.vue @@ -3,7 +3,7 @@ <x-notifications-column v-else-if="column.type == 'notifications'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> <x-tl-column v-else-if="column.type == 'home'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> <x-tl-column v-else-if="column.type == 'local'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> -<x-tl-column v-else-if="column.type == 'social'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> +<x-tl-column v-else-if="column.type == 'hybrid'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> <x-tl-column v-else-if="column.type == 'global'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> <x-tl-column v-else-if="column.type == 'list'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> <x-tl-column v-else-if="column.type == 'hashtag'" :column="column" :is-stacked="isStacked" v-on="$listeners"/> diff --git a/src/client/app/common/views/deck/deck.tl-column.vue b/src/client/app/common/views/deck/deck.tl-column.vue index f6a9ee5286..5ab8ccb12f 100644 --- a/src/client/app/common/views/deck/deck.tl-column.vue +++ b/src/client/app/common/views/deck/deck.tl-column.vue @@ -3,7 +3,7 @@ <template #header> <fa v-if="column.type == 'home'" icon="home"/> <fa v-if="column.type == 'local'" :icon="['far', 'comments']"/> - <fa v-if="column.type == 'social'" icon="share-alt"/> + <fa v-if="column.type == 'hybrid'" icon="share-alt"/> <fa v-if="column.type == 'global'" icon="globe"/> <fa v-if="column.type == 'list'" icon="list"/> <fa v-if="column.type == 'hashtag'" icon="hashtag"/> @@ -80,7 +80,7 @@ export default Vue.extend({ switch (this.column.type) { case 'home': return this.$t('@deck.home'); case 'local': return this.$t('@deck.local'); - case 'social': return this.$t('@deck.social'); + case 'hybrid': return this.$t('@deck.hybrid'); case 'global': return this.$t('@deck.global'); case 'list': return this.column.list.name; case 'hashtag': return this.$store.state.settings.tagTimelines.find(x => x.id == this.column.tagTlId).title; diff --git a/src/client/app/common/views/deck/deck.tl.vue b/src/client/app/common/views/deck/deck.tl.vue index 83fc149a03..9284f06ee1 100644 --- a/src/client/app/common/views/deck/deck.tl.vue +++ b/src/client/app/common/views/deck/deck.tl.vue @@ -51,7 +51,7 @@ export default Vue.extend({ switch (this.src) { case 'home': return this.$root.stream.useSharedConnection('homeTimeline'); case 'local': return this.$root.stream.useSharedConnection('localTimeline'); - case 'social': return this.$root.stream.useSharedConnection('socialTimeline'); + case 'hybrid': return this.$root.stream.useSharedConnection('hybridTimeline'); case 'global': return this.$root.stream.useSharedConnection('globalTimeline'); } }, @@ -60,7 +60,7 @@ export default Vue.extend({ switch (this.src) { case 'home': return 'notes/timeline'; case 'local': return 'notes/local-timeline'; - case 'social': return 'notes/social-timeline'; + case 'hybrid': return 'notes/hybrid-timeline'; case 'global': return 'notes/global-timeline'; } }, @@ -107,7 +107,7 @@ export default Vue.extend({ this.$root.getMeta().then(meta => { this.disabled = !this.$store.state.i.isModerator && !this.$store.state.i.isAdmin && ( - meta.disableLocalTimeline && ['local', 'social'].includes(this.src) || + meta.disableLocalTimeline && ['local', 'hybrid'].includes(this.src) || meta.disableGlobalTimeline && ['global'].includes(this.src)); }); }, diff --git a/src/client/app/common/views/deck/deck.vue b/src/client/app/common/views/deck/deck.vue index a1bef84008..b46f2167ad 100644 --- a/src/client/app/common/views/deck/deck.vue +++ b/src/client/app/common/views/deck/deck.vue @@ -145,11 +145,11 @@ export default Vue.extend({ } }, { icon: 'share-alt', - text: this.$t('@deck.social'), + text: this.$t('@deck.hybrid'), action: () => { this.$store.commit('device/addDeckColumn', { id: uuid(), - type: 'social' + type: 'hybrid' }); } }, { @@ -302,7 +302,7 @@ export default Vue.extend({ isTlColumn(id) { const column = this.columns.find(c => c.id === id); - return ['home', 'local', 'social', 'global', 'list', 'hashtag', 'mentions', 'direct'].includes(column.type); + return ['home', 'local', 'hybrid', 'global', 'list', 'hashtag', 'mentions', 'direct'].includes(column.type); } } }); |