diff options
| author | dave <starpumadev@gmail.com> | 2019-03-26 10:52:46 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-26 10:52:46 -0400 |
| commit | 5fd589d5e717bbcbc46db5efb35878b993b6dfbc (patch) | |
| tree | 86691b1fa39bbd909307cd4f5eca368bde375661 /src/components/user_settings | |
| parent | 13e727b5eebb60330bc87c7ccc70109683c5b963 (diff) | |
| parent | 2f1e69047882a1fc36f87dc1fff752bc76e61fa4 (diff) | |
merge develop & resolve conflict
Diffstat (limited to 'src/components/user_settings')
| -rw-r--r-- | src/components/user_settings/user_settings.js | 8 | ||||
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index c0ab759c..72e7bb53 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -158,7 +158,13 @@ const UserSettings = { reader.readAsDataURL(file) }, submitAvatar (cropper, file) { - const img = cropper.getCroppedCanvas().toDataURL(file.type) + let img + if (cropper) { + img = cropper.getCroppedCanvas().toDataURL(file.type) + } else { + img = file + } + return this.$store.state.api.backendInteractor.updateAvatar({ params: { img } }).then((user) => { if (!user.error) { this.$store.commit('addNewUsers', [user]) diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index a1123638..c9e68808 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -192,6 +192,12 @@ <template slot="empty">{{$t('settings.no_blocks')}}</template> </block-list> </div> + + <div :label="$t('settings.mutes_tab')"> + <mute-list :refresh="true"> + <template slot="empty">{{$t('settings.no_mutes')}}</template> + </mute-list> + </div> </tab-switcher> </div> </div> |