From 29df1df67b2f979816be2c4afc552d4d16e86e14 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Sat, 8 Aug 2020 15:54:51 -0700 Subject: [PATCH] Fix file upload progress. --- Server/wwwroot/scripts/Commands/WebCommands.js | 10 +++++++--- Server/wwwroot/scripts/Commands/WebCommands.js.map | 2 +- Server/wwwroot/scripts/Commands/WebCommands.ts | 13 ++++++++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Server/wwwroot/scripts/Commands/WebCommands.js b/Server/wwwroot/scripts/Commands/WebCommands.js index ed4791bd..f92f8ea5 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.js +++ b/Server/wwwroot/scripts/Commands/WebCommands.js @@ -392,9 +392,13 @@ function uploadFiles(fileList) { AddConsoleOutput("File upload failed."); reject(); }); - xhr.addEventListener("progress", function (e) { - AddConsoleOutput("File upload progress: " + String(isFinite(e.loaded / e.total) ? e.loaded / e.total : 0) + "%"); - }); + xhr.upload.onprogress = (e) => { + var currentPercent = isFinite(e.loaded / e.total) ? Math.round(e.loaded / e.total * 100) : 0; + if (currentPercent != uploadPercent) { + var uploadPercent = currentPercent; + AddConsoleOutput("File upload progress: " + String(currentPercent) + "%"); + } + }; xhr.send(fd); }); } diff --git a/Server/wwwroot/scripts/Commands/WebCommands.js.map b/Server/wwwroot/scripts/Commands/WebCommands.js.map index 4991c41b..c9bcba64 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.js.map +++ b/Server/wwwroot/scripts/Commands/WebCommands.js.map @@ -1 +1 @@ -{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"WebCommands.js","sourceRoot":"","sources":["WebCommands.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Commands/WebCommands.ts b/Server/wwwroot/scripts/Commands/WebCommands.ts index ee16bac5..9ba2a350 100644 --- a/Server/wwwroot/scripts/Commands/WebCommands.ts +++ b/Server/wwwroot/scripts/Commands/WebCommands.ts @@ -537,9 +537,16 @@ function uploadFiles(fileList: FileList): Promise { AddConsoleOutput("File upload failed."); reject(); }); - xhr.addEventListener("progress", function (e) { - AddConsoleOutput("File upload progress: " + String(isFinite(e.loaded / e.total) ? e.loaded / e.total : 0) + "%"); - }); + + xhr.upload.onprogress = (e) => { + var currentPercent = isFinite(e.loaded / e.total) ? Math.round(e.loaded / e.total * 100) : 0; + + if (currentPercent != uploadPercent) { + var uploadPercent = currentPercent; + AddConsoleOutput("File upload progress: " + String(currentPercent) + "%"); + } + }; + xhr.send(fd); })