sjw
/
pleroma-fe
mirror of https://git.pleroma.social/sjw/pleroma-fe.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '419-avatar-cropper-png' into 'develop' 

Generate cropped avatar image in the original file type

Closes #419

See merge request pleroma/pleroma-fe!640
This commit is contained in:
Shpuld Shpludson 2019-03-05 14:40:08 +00:00
parent 3e4d465eba ff9e55ae42
commit 8cda230fba
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/image_cropper/image_cropper.js
View File

@ -67,7 +67,7 @@ const ImageCropper = {
submit () {
this.submitting = true
this.avatarUploadError = null
this.submitHandler(this.cropper, this.filename)
this.submitHandler(this.cropper, this.file)
.then(() => this.destroy())
.catch((err) => {
this.submitError = err
@ -88,14 +88,14 @@ const ImageCropper = {
readFile () {
const fileInput = this.$refs.input
if (fileInput.files != null && fileInput.files[0] != null) {
this.file = fileInput.files[0]
let reader = new window.FileReader()
reader.onload = (e) => {
this.dataUrl = e.target.result
this.$emit('open')
}
reader.readAsDataURL(fileInput.files[0])
this.filename = fileInput.files[0].name || 'unknown'
this.$emit('changed', fileInput.files[0], reader)
reader.readAsDataURL(this.file)
this.$emit('changed', this.file, reader)
}
},
clearError () {

4
src/components/user_settings/user_settings.js
View File

@ -157,8 +157,8 @@ const UserSettings = {
}
reader.readAsDataURL(file)
},
submitAvatar (cropper) {
const img = cropper.getCroppedCanvas().toDataURL('image/jpeg')
submitAvatar (cropper, file) {
const img = cropper.getCroppedCanvas().toDataURL(file.type)
return this.$store.state.api.backendInteractor.updateAvatar({ params: { img } }).then((user) => {
if (!user.error) {
this.$store.commit('addNewUsers', [user])