From 2279169018e481a49f918db8b2745a3a475fd87a Mon Sep 17 00:00:00 2001
From: Mauro Mugnaini <themaxx76@gmail.com>
Date: Fri, 5 Feb 2021 19:57:29 +0100
Subject: [PATCH] Using blob directly and removed useless code

---
 src/themes/d4science/account/account.ftl | 28 ++++--------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/themes/d4science/account/account.ftl b/src/themes/d4science/account/account.ftl
index 003b29d..40c86e4 100644
--- a/src/themes/d4science/account/account.ftl
+++ b/src/themes/d4science/account/account.ftl
@@ -98,7 +98,6 @@
 
         <script>
           function sendAvatar() {
-            var dataurl = null;
             var filesToUpload = avatar.files;
             var file = filesToUpload[0];
 
@@ -136,18 +135,20 @@
                     ctx = canvas.getContext("2d");
                     ctx.drawImage(img, 0, 0, width, height);
 
-                    dataurl = canvas.toDataURL("image/png");
+                    var imageBlob = canvas.toBlob("image/png");
 
                     var form = document.getElementById('theForm')
                     var formData = new FormData(form)
                     // Deleting the big image from the form data to prevent send
                     formData.delete('imageSelector')
                     // Adding new blob with new image with right size
-                    formData.append("image", dataURItoBlob(dataurl));
+                    formData.append("image", imageBlob);
                     var xhr = new XMLHttpRequest();
                     xhr.onreadystatechange = function() {
                       if (xhr.readyState == 4 && xhr.status == 200) {
                         location.reload();
+                      } else {
+                        alert('An error occurred uploading avatar image')
                       }
                     };
                     xhr.open(form.method, form.action, true);
@@ -156,27 +157,6 @@
             }
             // Load files into file reader
             reader.readAsDataURL(file);
-            return false;
-          }
-
-          function dataURItoBlob(dataURI) {
-            // convert base64/URLEncoded data component to raw binary data held in a string
-            var byteString;
-              if (dataURI.split(',')[0].indexOf('base64') >= 0) {
-              byteString = atob(dataURI.split(',')[1]);
-            } else {
-              byteString = unescape(dataURI.split(',')[1]);
-            }
-            // separate out the mime component
-            var mimeString = dataURI.split(',')[0].split(':')[1].split(';')[0];
-
-            // write the bytes of the string to a typed array
-            var ia = new Uint8Array(byteString.length);
-            for (var i = 0; i < byteString.length; i++) {
-                ia[i] = byteString.charCodeAt(i);
-            }
-
-            return new Blob([ia], {type:mimeString});
           }
         </script>