diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js index 64ae4d81..855fcdba 100644 --- a/copyparty/web/up2k.js +++ b/copyparty/web/up2k.js @@ -746,14 +746,10 @@ function up2k_init(have_crypto) { } var tasker = (function () { - var mutex = false, + var tto = null, was_busy = false; function taskerd() { - if (mutex) - return; - - mutex = true; while (true) { var is_busy = 0 != st.todo.hash.length + @@ -775,8 +771,8 @@ function up2k_init(have_crypto) { var now = new Date().getTime(); flag.take(now); if (!flag.ours) { - setTimeout(taskerd, 100); - mutex = false; + clearTimeout(tto); + tto = setTimeout(taskerd, 100); return; } } @@ -821,8 +817,8 @@ function up2k_init(have_crypto) { } if (!mou_ikkai) { - setTimeout(taskerd, 100); - mutex = false; + clearTimeout(tto); + tto = setTimeout(taskerd, 100); return; } } diff --git a/copyparty/web/upload.css b/copyparty/web/upload.css index 6be33351..b21cc931 100644 --- a/copyparty/web/upload.css +++ b/copyparty/web/upload.css @@ -90,8 +90,10 @@ background: #222; } #u2cards { - margin: 2.5em auto -2.5em auto; + padding: 1em 0 .2em 0; + margin: 1.5em auto -2.5em auto; text-align: center; + overflow: hidden; } #u2cards.w { width: 45em; @@ -110,12 +112,12 @@ border-radius: 0 .4em 0 0; } #u2cards a.act { - border-width: 1px 1px 0 1px; + border-width: 1px; border-radius: .3em .3em 0 0; margin-left: -1px; background: linear-gradient(to bottom, #454, #333); - box-shadow: 0 -.2em .19em #380; - border-color: #7c5 #583 #000 #583; + box-shadow: 0 -.17em .67em #280; + border-color: #7c5 #583 #333 #583; position: relative; color: #fd7; } @@ -260,8 +262,10 @@ html.light #u2cards a { background: linear-gradient(to bottom, #eee, #fff); } html.light #u2cards a.act { - background: inherit; color: #037; + background: inherit; + box-shadow: 0 -.17em .67em #0ad; + border-color: #09c #05a #eee #05a; } html.light #u2conf .txtbox { background: #fff;