AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

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

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

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

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