aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_settings/user_settings.js
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2019-03-23 22:21:57 +0200
committershpuld <shp@cock.li>2019-03-23 22:21:57 +0200
commitfd12263cacd2a869ad61dd8580f918b45d9b2a51 (patch)
treec70c4e548923d97893ab6a875cc354cd6895f8e8 /src/components/user_settings/user_settings.js
parent85584021fb1042a8934945d73f7d25b38f1c29d1 (diff)
parentf86a5dc80421f496a893efaa98f12f831da0adcb (diff)
merge develop in
Diffstat (limited to 'src/components/user_settings/user_settings.js')
-rw-r--r--src/components/user_settings/user_settings.js8
1 files changed, 7 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])