FarmMaps
/
FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return correct file
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details

2022.01
Willem Dantuma 2021-03-02 16:51:16 +01:00
parent 2dd10f04a3
commit b000d5119a
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts
View File

@ -59,15 +59,13 @@ export class EditImageModalComponent implements OnInit {
save() {
if(this.croppedImage) {
if(this.saveImage) {
var body = this.croppedImage.substr(23);
this.imageService.putImage(this.endpointUrl,this.imageService.b64toBlob(body,"image/jpeg")).subscribe(() => {
var blob = this.imageService.dataUrltoBlob(this.croppedImage);
if(this.saveImage) {
this.imageService.putImage(this.endpointUrl,blob).subscribe(() => {
this.changed.emit({});
});
} else {
var selectedImage = (this.imageChangedEvent.target.files && this.imageChangedEvent.target.files[0]) ?
this.imageChangedEvent.target.files[0] : null;
this.changed.emit({ "croppedImage": this.croppedImage, "selectedImage": selectedImage } );
this.changed.emit({ "croppedImage": this.imageService.blobToFile(blob,"croppedimage.jpg")} );
}
this.modalService.dismissAll("Save");
}

13
projects/common/src/fm/services/image.service.ts
View File

@ -21,9 +21,12 @@ export class ImageService {
return this.httpClient.put<any>(endpoint,formData);
}
b64toBlob(b64Data:string, contentType?:string):Blob {
dataUrltoBlob(dataURI:string):Blob {
var mime = dataURI.split( ';base64,')[0].split(':')[1];
var byteCharacters = atob(dataURI.split( ';base64,')[1]);
const sliceSize = 512;
const byteCharacters = atob(b64Data);
const byteArrays = [];
for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
@ -38,7 +41,11 @@ export class ImageService {
byteArrays.push(byteArray);
}
const blob = new Blob(byteArrays, {type: contentType});
const blob = new Blob(byteArrays, {type: mime});
return blob;
}
blobToFile(blob:Blob, filename:string):File {
return new File([blob],filename);
}
}