diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-30 06:05:52 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-04-30 06:05:52 +0000 |
| commit | 0f7f685c5e720d870cc732f07f68fb6eac278a68 (patch) | |
| tree | fc095a3f597247bb5355b671328cfe7006079a4c /src/components/image_cropper/image_cropper.js | |
| parent | d94fdd0617057f17a677e7e409f65021afc9d124 (diff) | |
| parent | 3665c86d709f3a04ae3471d09b84a69c8a8c9172 (diff) | |
Merge branch '437-user-profile-settings' into 'develop'
Transition to MastoAPI: user profile settings
Closes #437
See merge request pleroma/pleroma-fe!682
Diffstat (limited to 'src/components/image_cropper/image_cropper.js')
| -rw-r--r-- | src/components/image_cropper/image_cropper.js | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js index 5ba8f04e..01361e25 100644 --- a/src/components/image_cropper/image_cropper.js +++ b/src/components/image_cropper/image_cropper.js @@ -70,22 +70,10 @@ const ImageCropper = { this.dataUrl = undefined this.$emit('close') }, - submit () { + submit (cropping = true) { this.submitting = true this.avatarUploadError = null - this.submitHandler(this.cropper, this.file) - .then(() => this.destroy()) - .catch((err) => { - this.submitError = err - }) - .finally(() => { - this.submitting = false - }) - }, - submitWithoutCropping () { - this.submitting = true - this.avatarUploadError = null - this.submitHandler(false, this.dataUrl) + this.submitHandler(cropping && this.cropper, this.file) .then(() => this.destroy()) .catch((err) => { this.submitError = err |