diff --git a/app/fileSender.js b/app/fileSender.js index a3fb7a25..99f2ad12 100644 --- a/app/fileSender.js +++ b/app/fileSender.js @@ -78,10 +78,11 @@ export default class FileSender extends Nanobus { this.keychain, p => { this.progress = p; - this.emit('progress', p); + this.emit('progress'); } ); this.msg = 'fileSizeProgress'; + this.emit('progress'); // HACK to kick MS Edge try { const result = await this.uploadRequest.result; const time = Date.now() - start; diff --git a/app/templates/progress/index.js b/app/templates/progress/index.js index f9f67e44..4ab9a1d3 100644 --- a/app/templates/progress/index.js +++ b/app/templates/progress/index.js @@ -7,6 +7,10 @@ const oDiameter = oRadius * 2; const circumference = 2 * Math.PI * radius; module.exports = function(progressRatio, indefinite = false) { + // HACK - never indefinite for MS Edge + if (/edge/i.test(navigator.userAgent)) { + indefinite = false; + } const p = indefinite ? 0.2 : progressRatio; const dashOffset = (1 - p) * circumference; const progressPercent = html`