diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-04-30 15:11:30 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-04-30 15:11:30 +0000 |
| commit | b1bd5bd08eccbe93d37aa1708692cad50003fd58 (patch) | |
| tree | de2de7d792a17ccd1ac74773cd05f3d18c2de60e /src/components/image_cropper/image_cropper.vue | |
| parent | da08388d6af314fb298bae011da31bcfc8ac0a45 (diff) | |
| parent | 0f7f685c5e720d870cc732f07f68fb6eac278a68 (diff) | |
Merge branch 'develop' into 'brendenbice1222/pleroma-fe-issues/pleroma-fe-202-show-boosted-users'
# Conflicts:
# src/services/api/api.service.js
Diffstat (limited to 'src/components/image_cropper/image_cropper.vue')
| -rw-r--r-- | src/components/image_cropper/image_cropper.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue index 129e6f46..d2b86e9e 100644 --- a/src/components/image_cropper/image_cropper.vue +++ b/src/components/image_cropper/image_cropper.vue @@ -5,9 +5,9 @@ <img ref="img" :src="dataUrl" alt="" @load.stop="createCropper" /> </div> <div class="image-cropper-buttons-wrapper"> - <button class="btn" type="button" :disabled="submitting" @click="submit" v-text="saveText"></button> + <button class="btn" type="button" :disabled="submitting" @click="submit()" v-text="saveText"></button> <button class="btn" type="button" :disabled="submitting" @click="destroy" v-text="cancelText"></button> - <button class="btn" type="button" :disabled="submitting" @click="submitWithoutCropping" v-text="saveWithoutCroppingText"></button> + <button class="btn" type="button" :disabled="submitting" @click="submit(false)" v-text="saveWithoutCroppingText"></button> <i class="icon-spin4 animate-spin" v-if="submitting"></i> </div> <div class="alert error" v-if="submitError"> |