From 7c6062e1e07c505d9d09860283211d40e52451a3 Mon Sep 17 00:00:00 2001 From: schlagmichdoch Date: Fri, 9 Feb 2024 02:09:53 +0100 Subject: [PATCH] Solve "transfer-complete" and "receive-complete" status detection via css instead of adding a new class --- public/scripts/ui.js | 7 +------ public/styles/styles-deferred.css | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/public/scripts/ui.js b/public/scripts/ui.js index a58a98f..617dcb2 100644 --- a/public/scripts/ui.js +++ b/public/scripts/ui.js @@ -807,16 +807,11 @@ class PeerUI { this.$el.querySelector('.status').innerText = statusName; this._currentStatus = status; - if (status === "transfer-complete" || status === "receive-complete") { - this.$el.classList.remove('blink'); - + if (status.indexOf("-complete") || status === "receive-complete") { this.statusTimeout = setTimeout(() => { this.setProgress(0, null); }, 10000); } - else { - this.$el.classList.add('blink'); - } } _onDrop(e) { diff --git a/public/styles/styles-deferred.css b/public/styles/styles-deferred.css index 12be300..f7f4020 100644 --- a/public/styles/styles-deferred.css +++ b/public/styles/styles-deferred.css @@ -188,12 +188,12 @@ x-peer:not(.type-public-id) .highlight-room-public-id { display: none; } -x-peer:not([status].blink):hover, -x-peer:not([status].blink):focus { +x-peer:is(:not([status]), [status$=-complete]):hover, +x-peer:is(:not([status]), [status$=-complete]):focus { transform: scale(1.05); } -x-peer[status].blink x-icon { +x-peer[status]:not([status$=-complete]) x-icon { box-shadow: none; } @@ -249,7 +249,7 @@ x-peer[status] .device-name { display: none; } -x-peer[status].blink { +x-peer[status]:not([status$=-complete]) { pointer-events: none; } @@ -257,7 +257,7 @@ x-peer { animation: pop 600ms ease-out 1; } -x-peer[status]:not(.blink) .status { +x-peer[status$=-complete] .status { color: var(--primary-color); }