diff options
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/attachment/attachment.js | 6 | ||||
| -rw-r--r-- | src/components/settings/settings.js | 6 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 4 | ||||
| -rw-r--r-- | src/components/status/status.js | 6 | ||||
| -rw-r--r-- | src/components/status/status.vue | 8 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.js | 9 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 9 |
7 files changed, 25 insertions, 23 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 47939852..3b7f08dc 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -57,9 +57,9 @@ const Attachment = { } }, openModal (event) { - const modalTypes = this.$store.state.config.playVideosInline - ? ['image'] - : ['image', 'video'] + const modalTypes = this.$store.state.config.playVideosInModal + ? ['image', 'video'] + : ['image'] if (fileTypeService.fileMatchesSomeType(modalTypes, this.attachment) || this.usePlaceHolder ) { diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 7000fa5e..8d138485 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -66,7 +66,7 @@ const settings = { Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') || // Future spec, still not supported in Nightly 63 as of 08/2018 Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'), - playVideosInline: user.playVideosInline, + playVideosInModal: user.playVideosInModal, useContainFit: user.useContainFit } }, @@ -164,8 +164,8 @@ const settings = { this.$store.dispatch('setOption', { name: 'webPushNotifications', value }) if (value) this.$store.dispatch('registerPushNotifications') }, - playVideosInline (value) { - this.$store.dispatch('setOption', { name: 'playVideosInline', value }) + playVideosInModal (value) { + this.$store.dispatch('setOption', { name: 'playVideosInModal', value }) }, useContainFit (value) { this.$store.dispatch('setOption', { name: 'useContainFit', value }) diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 08d659d6..9953780f 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -146,8 +146,8 @@ </ul> </li> <li> - <input type="checkbox" id="playVideosInline" v-model="playVideosInline"> - <label for="playVideosInline">{{$t('settings.play_videos_inline')}}</label> + <input type="checkbox" id="playVideosInModal" v-model="playVideosInModal"> + <label for="playVideosInModal">{{$t('settings.play_videos_in_modal')}}</label> </li> <li> <input type="checkbox" id="useContainFit" v-model="useContainFit"> diff --git a/src/components/status/status.js b/src/components/status/status.js index 25fa205d..7bf4fa2d 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -222,9 +222,9 @@ const Status = { if (this.attachmentSize === 'hide') { return [] } - return this.$store.state.config.playVideosInline - ? ['image'] - : ['image', 'video'] + return this.$store.state.config.playVideosInModal + ? ['image', 'video'] + : ['image'] }, galleryAttachments () { return this.status.attachments.filter( diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 5f3998a4..7581f749 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -285,6 +285,14 @@ overflow: hidden; white-space: nowrap; } + & > span { + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + } + & > a:last-child { + flex-shrink: 0; + } } .reply-info { display: flex; diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 719a9c0c..9bd8aa00 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -10,8 +10,7 @@ const UserSettings = { newLocked: this.$store.state.users.currentUser.locked, newNoRichText: this.$store.state.users.currentUser.no_rich_text, newDefaultScope: this.$store.state.users.currentUser.default_scope, - hideFollowings: this.$store.state.users.currentUser.hide_followings, - hideFollowers: this.$store.state.users.currentUser.hide_followers, + newHideNetwork: this.$store.state.users.currentUser.hide_network, followList: null, followImportError: false, followsImported: false, @@ -67,8 +66,7 @@ const UserSettings = { /* eslint-disable camelcase */ const default_scope = this.newDefaultScope const no_rich_text = this.newNoRichText - const hide_followings = this.hideFollowings - const hide_followers = this.hideFollowers + const hide_network = this.newHideNetwork /* eslint-enable camelcase */ this.$store.state.api.backendInteractor .updateProfile({ @@ -80,8 +78,7 @@ const UserSettings = { /* eslint-disable camelcase */ default_scope, no_rich_text, - hide_followings, - hide_followers + hide_network /* eslint-enable camelcase */ }}).then((user) => { if (!user.error) { diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index 2a5af99c..be42cc4a 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -30,17 +30,14 @@ <label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label> </p> <p> - <input type="checkbox" v-model="hideFollowings" id="account-hide-followings"> - <label for="account-hide-followings">{{$t('settings.hide_followings_description')}}</label> - </p> - <p> - <input type="checkbox" v-model="hideFollowers" id="account-hide-followers"> - <label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label> + <input type="checkbox" v-model="newHideNetwork" id="account-hide-network"> + <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label> </p> <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button> </div> <div class="setting-item"> <h2>{{$t('settings.avatar')}}</h2> + <p class="visibility-notice">{{$t('settings.avatar_size_instruction')}}</p> <p>{{$t('settings.current_avatar')}}</p> <img :src="user.profile_image_url_original" class="old-avatar"></img> <p>{{$t('settings.set_new_avatar')}}</p> |