diff --git a/www/common/make-backup.js b/www/common/make-backup.js index 0d50dfde4..3e9426be5 100644 --- a/www/common/make-backup.js +++ b/www/common/make-backup.js @@ -92,7 +92,15 @@ define([ var opts = { password: pData.password }; - updateProgress.progress(0); + var done = false; + ctx.sframeChan.on("EV_CRYPTGET_PROGRESS", function (data) { + if (done || data.hash !== parsed.hash) { return; } + updateProgress.progress(data.progress); + if (data.progress === 1) { + done = true; + updateProgress.progress2(1); + } + }); ctx.get({ hash: parsed.hash, opts: opts @@ -100,12 +108,9 @@ define([ if (cancelled) { return; } if (err) { return; } if (!val) { return; } - updateProgress.progress(1); - transform(ctx, parsed.type, val, function (res) { if (cancelled) { return; } if (!res.data) { return; } - updateProgress.progress2(1); var dl = function () { saveAs(res.data, Util.fixFileName(name)); }; diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index da26531c1..0836a8553 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -482,6 +482,7 @@ define([ var ctx = { get: common.getPad, + sframeChan: sframeChan, }; var dl = downloadFunction(ctx, data, function (err, obj) { $link.prepend($('', {'class': 'fa fa-external-link'})) diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js index 0103cdbaf..44fcde159 100644 --- a/www/common/sframe-common-outer.js +++ b/www/common/sframe-common-outer.js @@ -880,7 +880,12 @@ define([ error: err, data: val }); - }, data.opts); + }, data.opts, function (progress) { + sframeChan.event("EV_CRYPTGET_PROGRESS", { + hash: data.hash, + progress: progress, + }); + }); }; //return void todo(); if (i > 30) {