Skip to content

dashboard: decode URL escapes like %5E so that ^ can be put into initialFilter #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ivan merged 2 commits into from
Jul 17, 2023
Merged

dashboard: decode URL escapes like %5E so that ^ can be put into initialFilter #559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a30ed2b
dashboard: remove our `intoObject` and use `Object.fromEntries`
ivan Jul 17, 2023
ecd91c0
dashboard: use `URLSearchParams` instead of our own query arg parser
ivan Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions dashboard/assets/scripts/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,25 +122,6 @@ function regExpEscape(s) {
return escaped;
}

/**
* [[1, 2], [3, 4]] -> {1: 2, 3: 4}
*/
function intoObject(arr) {
const obj = {};
arr.forEach((e) => {
obj[e[0]] = e[1];
});
return obj;
}

function getQueryArgs() {
const pairs = location.search.replace("?", "").split("&");
if (pairs === "") {
return {};
}
return intoObject(pairs.map((e) => split(e, "=", 1)));
}

function addAnyChangeListener(elem, func) {
// DOM0 handler for convenient use by Clear button
elem.onchange = func;
Expand Down Expand Up @@ -1009,7 +990,7 @@ class Dashboard {
this.newItemsReceived = 0;
this.newBytesReceived = 0;

const args = getQueryArgs();
const args = Object.fromEntries(new URLSearchParams(window.location.search));

const historyLines = args.historyLines ? Number(args.historyLines) : navigator.userAgent.match(/Mobi/) ? 250 : 500;
const batchTimeWhenVisible = args.batchTimeWhenVisible ? Number(args.batchTimeWhenVisible) : 125;
Expand Down