mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-01-08 08:07:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

WebUI: use idiomatic string methods

Browse source
This commit is contained in:
Chocobo1 2024-11-23 03:40:12 +08:00
parent f34787e6ba
commit 5eec0c0213
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/webui/www/private/scripts/client.js
View file

@ -1492,7 +1492,7 @@ window.addEventListener("DOMContentLoaded", () => {
const handleDownloadParam = () => { const handleDownloadParam = () => {
// Extract torrent URL from download param in WebUI URL hash // Extract torrent URL from download param in WebUI URL hash
const downloadHash = "#download="; const downloadHash = "#download=";
if (location.hash.indexOf(downloadHash) !== 0) if (!location.hash.startsWith(downloadHash))
return; return;
const url = decodeURIComponent(location.hash.substring(downloadHash.length)); const url = decodeURIComponent(location.hash.substring(downloadHash.length));

6
src/webui/www/private/scripts/misc.js
View file

@ -255,8 +255,8 @@ window.qBittorrent.Misc ??= (() => {
const containsAllTerms = (text, terms) => { const containsAllTerms = (text, terms) => {
const textToSearch = text.toLowerCase(); const textToSearch = text.toLowerCase();
return terms.every((term) => { return terms.every((term) => {
const isTermRequired = (term[0] === "+"); const isTermRequired = term.startsWith("+");
const isTermExcluded = (term[0] === "-"); const isTermExcluded = term.startsWith("-");
if (isTermRequired || isTermExcluded) { if (isTermRequired || isTermExcluded) {
// ignore lonely +/- // ignore lonely +/-
if (term.length === 1) if (term.length === 1)
@ -265,7 +265,7 @@ window.qBittorrent.Misc ??= (() => {
term = term.substring(1); term = term.substring(1);
} }
const textContainsTerm = (textToSearch.indexOf(term) !== -1); const textContainsTerm = textToSearch.includes(term);
return isTermExcluded ? !textContainsTerm : textContainsTerm; return isTermExcluded ? !textContainsTerm : textContainsTerm;
}); });
}; };

2
src/webui/www/private/scripts/prop-trackers.js
View file

@ -146,7 +146,7 @@ window.qBittorrent.PropTrackers ??= (() => {
onShow: function() { onShow: function() {
const selectedTrackers = torrentTrackersTable.selectedRowsIds(); const selectedTrackers = torrentTrackersTable.selectedRowsIds();
const containsStaticTracker = selectedTrackers.some((tracker) => { const containsStaticTracker = selectedTrackers.some((tracker) => {
return (tracker.indexOf("** [") === 0); return tracker.startsWith("** [");
}); });
if (containsStaticTracker || (selectedTrackers.length === 0)) { if (containsStaticTracker || (selectedTrackers.length === 0)) {

8
src/webui/www/private/views/log.html
View file

@ -343,10 +343,10 @@
if (curTab === "main") { if (curTab === "main") {
url = new URI("api/v2/log/main"); url = new URI("api/v2/log/main");
url.setData({ url.setData({
normal: selectedLogLevels.indexOf("1") !== -1, normal: selectedLogLevels.includes("1"),
info: selectedLogLevels.indexOf("2") !== -1, info: selectedLogLevels.includes("2"),
warning: selectedLogLevels.indexOf("4") !== -1, warning: selectedLogLevels.includes("4"),
critical: selectedLogLevels.indexOf("8") !== -1 critical: selectedLogLevels.includes("8")
}); });
} }
else { else {

2
src/webui/www/private/views/preferences.html
View file

@ -2138,7 +2138,7 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
languages.push($("locale_select").options[i].value); languages.push($("locale_select").options[i].value);
if (!languages.includes(selected)) { if (!languages.includes(selected)) {
const lang = selected.slice(0, selected.indexOf("_")); const lang = selected.split("_", 1)[0];
selected = languages.includes(lang) ? lang : "en"; selected = languages.includes(lang) ? lang : "en";
} }
$("locale_select").value = selected; $("locale_select").value = selected;

2
src/webui/www/private/views/rssDownloader.html
View file

@ -388,7 +388,7 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
$("rssDownloaderFeeds").style.height = "calc(100% - " + centerRowNotTableHeight + "px)"; $("rssDownloaderFeeds").style.height = "calc(100% - " + centerRowNotTableHeight + "px)";
// firefox calculates the height of the table inside fieldset differently and thus doesn't need the offset // firefox calculates the height of the table inside fieldset differently and thus doesn't need the offset
if (navigator.userAgent.toLowerCase().indexOf("firefox") > -1) { if (navigator.userAgent.toLowerCase().includes("firefox")) {
$("rssDownloaderFeedsTable").style.height = "100%"; $("rssDownloaderFeedsTable").style.height = "100%";
} }
else { else {