From 0a81aba899f0838a10fbba1c4ca04a662da795f6 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Wed, 7 Sep 2022 23:34:43 +0200
Subject: [PATCH] fix wrong ETA after failed handshakes +

tooltip-hint positioning on bottom-most elements
---
 copyparty/web/up2k.js | 4 +++-
 copyparty/web/util.js | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/copyparty/web/up2k.js b/copyparty/web/up2k.js
index 154e870f..7275c08f 100644
--- a/copyparty/web/up2k.js
+++ b/copyparty/web/up2k.js
@@ -2178,7 +2178,6 @@ function up2k_init(subtle) {
                     return;
                 }
 
-                st.bytes.finished += t.size;
                 var err_pend = rsp.indexOf('partial upload exists') + 1,
                     err_dupe = rsp.indexOf('file already exists') + 1;
 
@@ -2197,6 +2196,9 @@ function up2k_init(subtle) {
                     return toast.err(0, L.u_ehsdf + "\n\n" + rsp.replace(/.*; /, ''));
 
                 if (err != "") {
+                    if (!t.t_uploading)
+                        st.bytes.finished += t.size;
+
                     pvis.seth(t.n, 1, "ERROR");
                     pvis.seth(t.n, 2, err);
                     pvis.move(t.n, 'ng');
diff --git a/copyparty/web/util.js b/copyparty/web/util.js
index e6e47bee..2f416a52 100644
--- a/copyparty/web/util.js
+++ b/copyparty/web/util.js
@@ -967,7 +967,7 @@ var tt = (function () {
         prev = this;
     };
 
-    var tev;
+    var tev, vh;
     r.dshow = function (e) {
         clearTimeout(tev);
         if (!r.getmsg(this))
@@ -980,6 +980,7 @@ var tt = (function () {
         if (TOUCH)
             return;
 
+        vh = window.innerHeight;
         this.addEventListener('mousemove', r.move);
         clmod(r.th, 'act', 1);
         r.move(e);
@@ -1058,8 +1059,9 @@ var tt = (function () {
     };
 
     r.move = function (e) {
+        var sy = e.clientY + 128 > vh ? -1 : 1;
         r.th.style.left = (e.pageX + 12) + 'px';
-        r.th.style.top = (e.pageY + 12) + 'px';
+        r.th.style.top = (e.pageY + 12 * sy) + 'px';
     };
 
     if (IPHONE) {