mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-24 18:26:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13388 from Chocobo1/webui

Browse source 
Add missing semicolons in WebUI
This commit is contained in:
Mike Tzou 2020-09-18 11:56:35 +08:00 committed by GitHub
commit 70d9ea8034
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/webui/www/private/scripts/dynamicTable.js
View file

@ -1305,9 +1305,9 @@ window.qBittorrent.DynamicTable = (function() {
return false; return false;
break; break;
default: default:
const tracker = trackerList.get(trackerHashInt) const tracker = trackerList.get(trackerHashInt);
if (tracker && !tracker.torrents.includes(row['full_data'].rowId)) if (tracker && !tracker.torrents.includes(row['full_data'].rowId))
return false return false;
break; break;
} }
@ -2480,7 +2480,7 @@ window.qBittorrent.DynamicTable = (function() {
tr.removeClass('articleTableFeed'); tr.removeClass('articleTableFeed');
tr.addClass('articleTableArticle'); tr.addClass('articleTableArticle');
} }
const tds = tr.getElements('td'); const tds = tr.getElements('td');
for (let i = 0; i < this.columns.length; ++i) { for (let i = 0; i < this.columns.length; ++i) {
if (data.hasOwnProperty(this.columns[i].dataProperties[0])) if (data.hasOwnProperty(this.columns[i].dataProperties[0]))
@ -2489,7 +2489,7 @@ window.qBittorrent.DynamicTable = (function() {
row['data'] = {}; row['data'] = {};
} }
}); });
return exports(); return exports();
})(); })();

4
src/webui/www/private/scripts/mocha-init.js
View file

@ -824,7 +824,7 @@ const initializeWindows = function() {
hashes = torrentsTable.getFilteredTorrentsHashes('all', CATEGORIES_ALL, TAGS_ALL, TRACKERS_TRACKERLESS); hashes = torrentsTable.getFilteredTorrentsHashes('all', CATEGORIES_ALL, TAGS_ALL, TRACKERS_TRACKERLESS);
break; break;
default: default:
hashes = trackerList.get(trackerHashInt).torrents hashes = trackerList.get(trackerHashInt).torrents;
break; break;
} }
@ -851,7 +851,7 @@ const initializeWindows = function() {
hashes = torrentsTable.getFilteredTorrentsHashes('all', CATEGORIES_ALL, TAGS_ALL, TRACKERS_TRACKERLESS); hashes = torrentsTable.getFilteredTorrentsHashes('all', CATEGORIES_ALL, TAGS_ALL, TRACKERS_TRACKERLESS);
break; break;
default: default:
hashes = trackerList.get(trackerHashInt).torrents hashes = trackerList.get(trackerHashInt).torrents;
break; break;
} }

12
src/webui/www/private/views/rss.html
View file

@ -67,11 +67,11 @@
overflow: hidden; overflow: hidden;
height: 30px; height: 30px;
} }
#rssContentView table { #rssContentView table {
width: 100%; width: 100%;
} }
</style> </style>
<div id="rssView"> <div id="rssView">
@ -198,7 +198,7 @@
$('rssDetailsView').style.height = 'calc(100vh - ' + nonPageHeight + 'px)'; $('rssDetailsView').style.height = 'calc(100vh - ' + nonPageHeight + 'px)';
let nonTableHeight = nonPageHeight + $('rssFeedFixedHeaderDiv').getBoundingClientRect().height; let nonTableHeight = nonPageHeight + $('rssFeedFixedHeaderDiv').getBoundingClientRect().height;
$('rssFeedTableDiv').style.height = 'calc(100vh - ' + nonTableHeight + 'px)'; $('rssFeedTableDiv').style.height = 'calc(100vh - ' + nonTableHeight + 'px)';
$('rssArticleTableDiv').style.height = 'calc(100vh - ' + nonTableHeight + 'px)'; $('rssArticleTableDiv').style.height = 'calc(100vh - ' + nonTableHeight + 'px)';
@ -229,7 +229,7 @@
.filter((e) => e !== 0) .filter((e) => e !== 0)
.map((sRow) => rssFeedTable.rows[sRow].full_data.dataPath); .map((sRow) => rssFeedTable.rows[sRow].full_data.dataPath);
// filter children // filter children
let reducedDatapaths = selectedDatapaths.filter((path) => let reducedDatapaths = selectedDatapaths.filter((path) =>
selectedDatapaths.filter((innerPath) => path.slice(0, innerPath.length) === innerPath).length === 1 selectedDatapaths.filter((innerPath) => path.slice(0, innerPath.length) === innerPath).length === 1
); );
removeItem(reducedDatapaths); removeItem(reducedDatapaths);
@ -462,7 +462,7 @@
recFlatten(current[child], child, depth + 1, currentFullName); recFlatten(current[child], child, depth + 1, currentFullName);
} }
} }
} };
recFlatten(response); recFlatten(response);
// check if rows matche flattend response // check if rows matche flattend response
@ -792,7 +792,7 @@
let selectedDatapaths = rssFeedTable.selectedRows let selectedDatapaths = rssFeedTable.selectedRows
.map((sRow) => rssFeedTable.rows[sRow].full_data.dataPath); .map((sRow) => rssFeedTable.rows[sRow].full_data.dataPath);
// filter children // filter children
let reducedDatapaths = selectedDatapaths.filter((path) => let reducedDatapaths = selectedDatapaths.filter((path) =>
selectedDatapaths.filter((innerPath) => path.slice(0, innerPath.length) === innerPath).length === 1 selectedDatapaths.filter((innerPath) => path.slice(0, innerPath.length) === innerPath).length === 1
); );
reducedDatapaths.each((path) => markItemAsRead(path)); reducedDatapaths.each((path) => markItemAsRead(path));

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

@ -79,7 +79,7 @@
#lastMatchDiv { #lastMatchDiv {
float: right; float: right;
} }
#ruleSettings { #ruleSettings {
padding: 4px 10px 4px 10px padding: 4px 10px 4px 10px
} }
@ -456,7 +456,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
}).send(); }).send();
$('savetoDifferentDir').addEvent('click', () => { $('savetoDifferentDir').addEvent('click', () => {
$('saveToText').disabled = !$('savetoDifferentDir').checked; $('saveToText').disabled = !$('savetoDifferentDir').checked;
}) });
updateRulesList(); updateRulesList();
}; };
@ -757,7 +757,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
' ● QBT_TR(? to match any single character)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(? to match any single character)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(* to match zero or more of any characters)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(* to match zero or more of any characters)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Whitespaces count as AND operators (all words, any order))QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Whitespaces count as AND operators (all words, any order))QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(| is used as OR operator)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' + ' ● QBT_TR(| is used as OR operator)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' +
'QBT_TR(If word order is important use * instead of whitespace.)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n'; 'QBT_TR(If word order is important use * instead of whitespace.)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n';
} }
let secondPart = 'QBT_TR(An expression with an empty %1 clause (e.g. %2))QBT_TR[CONTEXT=AutomatedRssDownloader]' let secondPart = 'QBT_TR(An expression with an empty %1 clause (e.g. %2))QBT_TR[CONTEXT=AutomatedRssDownloader]'
@ -768,15 +768,15 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
let episodeFilterTitle = 'QBT_TR(Matches articles based on episode filter.)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' + let episodeFilterTitle = 'QBT_TR(Matches articles based on episode filter.)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' +
'QBT_TR(Example: )QBT_TR[CONTEXT=AutomatedRssDownloader]' + 'QBT_TR(Example: )QBT_TR[CONTEXT=AutomatedRssDownloader]' +
'1x2;8-15;5;30-;' + '1x2;8-15;5;30-;' +
'QBT_TR( will match 2, 5, 8 through 15, 30 and onward episodes of season one)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' + 'QBT_TR( will match 2, 5, 8 through 15, 30 and onward episodes of season one)QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' +
'QBT_TR(Episode filter rules: )QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' + 'QBT_TR(Episode filter rules: )QBT_TR[CONTEXT=AutomatedRssDownloader]\n\n' +
' ● QBT_TR(Season number is a mandatory non-zero value)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Season number is a mandatory non-zero value)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Episode number is a mandatory positive value)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Episode number is a mandatory positive value)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Filter must end with semicolon)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Filter must end with semicolon)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Three range types for episodes are supported: )QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Three range types for episodes are supported: )QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Single number: <b>1x25;</b> matches episode 25 of season one)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Single number: <b>1x25;</b> matches episode 25 of season one)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Normal range: <b>1x25-40;</b> matches episodes 25 through 40 of season one)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' + ' ● QBT_TR(Normal range: <b>1x25-40;</b> matches episodes 25 through 40 of season one)QBT_TR[CONTEXT=AutomatedRssDownloader]\n' +
' ● QBT_TR(Infinite range: <b>1x25-;</b> matches episodes 25 and upward of season one, and all episodes of later seasons)QBT_TR[CONTEXT=AutomatedRssDownloader]'; ' ● QBT_TR(Infinite range: <b>1x25-;</b> matches episodes 25 and upward of season one, and all episodes of later seasons)QBT_TR[CONTEXT=AutomatedRssDownloader]';
episodeFilterTitle = episodeFilterTitle.replace(/<b>/g, '').replace(/<\/b>/g, ''); episodeFilterTitle = episodeFilterTitle.replace(/<b>/g, '').replace(/<\/b>/g, '');