Fix for no progress events

GetmeUK · Aug 9, 2018 · 1542eb7 · 1542eb7
1 parent c9d59bf
commit 1542eb7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/module/ui/image-editor.js b/module/ui/image-editor.js
@@ -107,7 +107,6 @@ export class ImageEditor extends Overlay {
 
             // Create the base image to paste into the canvas
             const baseImage = new Image()
-            baseImage.setAttribute('crossOrigin', 'anonymous')
             baseImage.src = this._imageURL
 
             baseImage.onload = () => {

diff --git a/module/ui/uploader.js b/module/ui/uploader.js
@@ -9,7 +9,7 @@ export function defaultStatusTemplate(progress) {
     } else if (progress >= 100) {
         return 'Processing'
     }
-    return `Uploading ${progress}%`
+    return `Uploading ${parseInt(progress)}%`
 }
 
 
@@ -96,13 +96,15 @@ export class Uploader {
             'reqProgress': (event) => {
                 // Update the progress bar
                 if (event.lengthComputable) {
-                    this._progress(event.loaded / event.total)
+                    const total = Math.max(1, event.total)
+                    this._progress(event.loaded / total * 100)
                 } else {
                     this._progress(0)
                 }
             },
 
             'reqLoad': (event) => {
+                console.log(event)
                 const {response} = this._xhr
 
                 // Clear the handle to the request
@@ -141,10 +143,15 @@ export class Uploader {
                 {
                     'abort': this._handlers.reqAbort,
                     'error': this._handlers.reqError,
-                    'progress': this._handlers.reqProgress,
                     'load': this._handlers.reqLoad
                 }
             )
+            $.ignore(
+                this._xhr.upload,
+                {
+                    'progress': this._handlers.reqProgress,
+                }
+            )
             this._xhr.abort()
         }
 
@@ -260,11 +267,17 @@ export class Uploader {
             {
                 'abort': this._handlers.reqAbort,
                 'error': this._handlers.reqError,
-                'progress': this._handlers.reqProgress,
                 'load': this._handlers.reqLoad
             }
         )
 
+        $.listen(
+            this._xhr.upload,
+            {
+                'progress': this._handlers.reqProgress,
+            }
+        )
+
         // Send the request
         this._xhr.open('POST', this._url, true)
         this._xhr.send(this._formData)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "manhattan-assets",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "File and image uploads for forms.",
   "engines": {
     "node": ">=8.9.4"