diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-21 15:44:26 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-21 15:44:26 +0000 |
| commit | 9890e414402ce19ab012d3fc8046bd6af537fd5c (patch) | |
| tree | 495fab56bbda17de803b85ba677c226433a4f506 /src/components/user_settings/user_settings.js | |
| parent | 9e17853b2ce6fd494b1db2e2313876c24b6fddc6 (diff) | |
| parent | 3108722eda845cd3a8172b95e554b0dc8c8e444d (diff) | |
Merge branch 'feature/bypass-avatar-cropper' into 'develop'
#443 Add button to save without cropping
Closes #443
See merge request pleroma/pleroma-fe!691
Diffstat (limited to 'src/components/user_settings/user_settings.js')
| -rw-r--r-- | src/components/user_settings/user_settings.js | 8 |
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]) |