techwire/copyparty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better fix for the up2k bounce

Browse Source
This commit is contained in:
ed 2021-09-05 18:50:24 +02:00
parent 314327d8f2
commit a3ecbf0ae7
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
copyparty/web/browser.css
View File

@ -1542,7 +1542,8 @@ html.light #bbox-overlay figcaption a {
#op_up2k { #op_up2k {
padding: 0 1em 1em 1em; padding: 0 1em 1em 1em;
min-height: 60em; min-height: 0;
transition: min-height .2s;
} }
#u2form { #u2form {
position: absolute; position: absolute;

14
copyparty/web/up2k.js
View File

@ -904,7 +904,7 @@ function up2k_init(subtle) {
} }
ebi('u2cleanup').onclick = u2cleanup; ebi('u2cleanup').onclick = u2cleanup;
var etaref = 0, etaskip = 0; var etaref = 0, etaskip = 0, op_minh = 0;
function etafun() { function etafun() {
var nhash = st.busy.head.length + st.busy.hash.length + st.todo.head.length + st.todo.hash.length, var nhash = st.busy.head.length + st.busy.hash.length + st.todo.head.length + st.todo.hash.length,
nsend = st.busy.upload.length + st.todo.upload.length, nsend = st.busy.upload.length + st.todo.upload.length,
@ -917,6 +917,15 @@ function up2k_init(subtle) {
//ebi('acc_info').innerHTML = humantime(st.time.busy) + ' ' + f2f(now / 1000, 1); //ebi('acc_info').innerHTML = humantime(st.time.busy) + ' ' + f2f(now / 1000, 1);
var op = ebi('op_up2k'),
uff = ebi('u2footfoot'),
minh = QS('#op_up2k.act') ? Math.max(op_minh, uff.offsetTop + uff.offsetHeight - op.offsetTop + 32) : 0;
if (minh > op_minh || !op_minh) {
op_minh = minh;
op.style.minHeight = op_minh + 'px';
}
if (!nhash) if (!nhash)
ebi('u2etah').innerHTML = 'Done ({0}, {1} files)'.format(humansize(st.bytes.hashed), pvis.ctr["ok"] + pvis.ctr["ng"]); ebi('u2etah').innerHTML = 'Done ({0}, {1} files)'.format(humansize(st.bytes.hashed), pvis.ctr["ok"] + pvis.ctr["ng"]);
@ -1078,6 +1087,7 @@ function up2k_init(subtle) {
toast.err(t, '{0} {1}'.format(ks, tng)); toast.err(t, '{0} {1}'.format(ks, tng));
timer.rm(etafun); timer.rm(etafun);
op_minh = 0;
} }
else { else {
timer.add(etafun, false); timer.add(etafun, false);
@ -1903,7 +1913,7 @@ function up2k_init(subtle) {
if (parallel_uploads < 1) if (parallel_uploads < 1)
bumpthread(1); bumpthread(1);
return { "init_deps": init_deps, "set_fsearch": set_fsearch } return { "init_deps": init_deps, "set_fsearch": set_fsearch, "ui": pvis }
} }