shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

webui: fix search encode in url hash. resolves #7265 (#7299)

Browse Source
This commit is contained in:
Diego Heras
2020-02-23 04:30:57 +01:00
committed by GitHub
parent 694c39503b
commit 5d808e006d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Jackett.Common/Content/custom.js
View File

@@ -51,7 +51,12 @@ $(document).ready(function () {
}); });
function openSearchIfNecessary() { function openSearchIfNecessary() {
const hashArgs = location.hash.substring(1).split('&').reduce((prev, item) => Object.assign({ [item.split('=')[0]]: (item.split('=').length < 2 ? undefined : decodeURIComponent(item.split('=')[1])) }, prev), {}); const hashArgs = location.hash.substring(1).split('&').reduce((prev, item) =>
Object.assign({
[item.split('=')[0]]: (item.split('=').length < 2 ?
undefined :
decodeURIComponent(item.split('=')[1].replace(/\+/g,'%20')))
}, prev), {});
if ("search" in hashArgs) { if ("search" in hashArgs) {
showSearch(hashArgs.tracker, hashArgs.search, hashArgs.category); showSearch(hashArgs.tracker, hashArgs.search, hashArgs.category);
} }
@@ -775,7 +780,7 @@ function updateReleasesRow(row)
} }
function showSearch(selectedIndexer, query, category) { function showSearch(selectedIndexer, query, category) {
var selectedIndexers = [] var selectedIndexers = [];
if (selectedIndexer) if (selectedIndexer)
selectedIndexers = selectedIndexer.split(","); selectedIndexers = selectedIndexer.split(",");
$('#select-indexer-modal').remove(); $('#select-indexer-modal').remove();
@@ -842,7 +847,11 @@ function showSearch(selectedIndexer, query, category) {
Tracker: releaseDialog.find('#searchTracker').val() Tracker: releaseDialog.find('#searchTracker').val()
}; };
window.location.hash = $.param({ search: queryObj.Query, tracker: queryObj.Tracker.join(","), category: queryObj.Category.join(",") }); window.location.hash = Object.entries({
search: encodeURIComponent(queryObj.Query).replace(/%20/g,'+'),
tracker: queryObj.Tracker.join(","),
category: queryObj.Category.join(",")
}).map(([k, v], i) => k + '=' + v).join('&');
$('#jackett-search-perform').html($('#spinner').html()); $('#jackett-search-perform').html($('#spinner').html());
$('#searchResults div.dataTables_filter input').val(""); $('#searchResults div.dataTables_filter input').val("");

2
src/Jackett.Common/Content/index.html
View File

@@ -691,6 +691,6 @@
</script> </script>
<script type="text/javascript" src="../libs/api.js?changed=2017083001"></script> <script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
<script type="text/javascript" src="../custom.js?changed=20200220"></script> <script type="text/javascript" src="../custom.js?changed=20200222"></script>
</body> </body>
</html> </html>