From 38070c6eee63c2930689268e35b87c87712707dc Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 12 Feb 2025 15:11:54 +0800 Subject: [PATCH] WebUI: use recommended function for checking NaN values Also fix a few variable names along the way. PR #22264. --- src/webui/www/private/scripts/dynamicTable.js | 2 +- src/webui/www/private/scripts/misc.js | 4 +- src/webui/www/private/scripts/progressbar.js | 2 +- src/webui/www/private/views/preferences.html | 446 +++++++++--------- 4 files changed, 232 insertions(+), 222 deletions(-) diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index ee9bf554f..7bc794a2a 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -1856,7 +1856,7 @@ window.qBittorrent.DynamicTable ??= (() => { }; const displayDate = function(td, row) { const value = this.getRowValue(row) * 1000; - const formattedValue = (isNaN(value) || (value <= 0)) ? "" : (new Date(value).toLocaleString()); + const formattedValue = (Number.isNaN(value) || (value <= 0)) ? "" : (new Date(value).toLocaleString()); td.textContent = formattedValue; td.title = formattedValue; }; diff --git a/src/webui/www/private/scripts/misc.js b/src/webui/www/private/scripts/misc.js index 7017a48ab..afa1b4838 100644 --- a/src/webui/www/private/scripts/misc.js +++ b/src/webui/www/private/scripts/misc.js @@ -164,7 +164,7 @@ window.qBittorrent.Misc ??= (() => { const friendlyPercentage = (value) => { let percentage = (value * 100).round(1); - if (isNaN(percentage) || (percentage < 0)) + if (Number.isNaN(percentage) || (percentage < 0)) percentage = 0; if (percentage > 100) percentage = 100; @@ -189,7 +189,7 @@ window.qBittorrent.Misc ??= (() => { const tryToNumber = (str) => { const num = Number(str); - return (isNaN(num) ? str : num); + return (Number.isNaN(num) ? str : num); }; const ver = versionString.split(".", 4).map(val => tryToNumber(val)); diff --git a/src/webui/www/private/scripts/progressbar.js b/src/webui/www/private/scripts/progressbar.js index 5ec45904f..3523c6b24 100644 --- a/src/webui/www/private/scripts/progressbar.js +++ b/src/webui/www/private/scripts/progressbar.js @@ -117,7 +117,7 @@ window.qBittorrent.ProgressBar ??= (() => { function ProgressBar_setValue(value) { value = parseFloat(value); - if (isNaN(value)) + if (Number.isNaN(value)) value = 0; value = Math.min(Math.max(value, 0), 100); this.vals.value = value; diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index 727eb318d..3ac2d988b 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -399,13 +399,13 @@
QBT_TR(Listening Port)QBT_TR[CONTEXT=OptionsDialog]
- - + +
- - + +
@@ -415,31 +415,31 @@ - - + + - + - - + + - + - - + + - - + + - + @@ -592,12 +592,12 @@ QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] - -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] + +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] - -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] + +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] @@ -612,12 +612,12 @@ QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] - -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] + +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] - -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] + +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] @@ -705,66 +705,66 @@
- - + +
- + - +
- + - +
- + - +
- - + + @@ -778,35 +778,35 @@ - +
- + -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
- + -   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(KiB/s)QBT_TR[CONTEXT=OptionsDialog]
- + -   QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog] +   QBT_TR(seconds)QBT_TR[CONTEXT=OptionsDialog]
- - + + - +
- - + + - QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog]
- - + + - QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(minutes)QBT_TR[CONTEXT=OptionsDialog]
- @@ -909,19 +909,19 @@
- + - - - + + +
- - + +
@@ -1043,10 +1043,10 @@ - + -