diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js
index 3fca9811..bd2b836c 100644
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -490,21 +490,36 @@ function Donut(st) {
function svg(v) {
var ico = v !== undefined,
- bg = ico ? '#' + r.bg : 'transparent';
+ bg = ico ? '#333' : 'transparent',
+ fg, fsz;
+
+ if (r.eta && r.eta > 99)
+ r.eta = null;
+
+ if (r.eta) {
+ fg = r.eta > 10 ? '#fff' : '#fa0';
+ fsz = ico && r.eta < 10 ? 64 : 56;
+ }
return (
''
+ (r.eta ? (
+ '' + r.eta + ''
+ ) : (
+ ''
+ ))
);
}
r.on = function (ya) {
r.fc = 99;
- r.bg = '333';
+ r.eta = null;
r.base = st.bytes.finished;
optab.innerHTML = ya ? svg() : optab.getAttribute('ico');
el = QS('#ops a .donut');
@@ -520,7 +535,7 @@ function Donut(st) {
ofs = el.style.strokeDashoffset = o - o * v / t;
if (favico.txt && ++r.fc > 4) {
- favico.upd(svg(ofs));
+ favico.upd('', svg(ofs));
r.fc = 0;
}
};
@@ -1118,9 +1133,7 @@ function up2k_init(subtle) {
continue;
}
- if (a == t.length - 1)
- donut.bg = eta < 10 ? 'da0' : eta < 30 ? '380' : eta < 60 ? '048' : '333';
-
+ donut.eta = eta;
if (etaskip)
continue;
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index 55db5d92..37add476 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -1239,7 +1239,7 @@ var favico = (function () {
);
}
- r.upd = function (svg) {
+ r.upd = function (txt, svg) {
if (!r.txt)
return;