Skip to content
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

Re-implement util functions using URL API #2954

Merged
merged 15 commits into from
Aug 10, 2021
Merged

Re-implement util functions using URL API #2954

Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d76a165
Re-implement getURLParameter() using URL API
TimonDB Aug 3, 2021
2638306
Fix indentation
TimonDB Aug 3, 2021
673bdd1
Re-implement getArrayURLParameter using URL API
TimonDB Aug 3, 2021
44d5f94
Remove redundant code lines
TimonDB Aug 4, 2021
874da26
Implement minor changes
TimonDB Aug 4, 2021
923c751
Apply suggestions from code review
TimonDB Aug 4, 2021
97040f0
Re-implement updateURLParameter using URL API
TimonDB Aug 5, 2021
25528fc
Merge branch 'util-functions-URL-API' of github.com:dodona-edu/dodona…
TimonDB Aug 5, 2021
65ebd4f
Re-implement updateArrayURLParameter using URL API
TimonDB Aug 5, 2021
33b8abc
Fix lint errors
TimonDB Aug 5, 2021
f1adca2
Fix loading of course index
chvp Aug 6, 2021
02eea31
Implement tests for URL functions
TimonDB Aug 9, 2021
a6f61c3
Use correct base URL
TimonDB Aug 9, 2021
45928bb
Adapt test URLs
TimonDB Aug 9, 2021
cdafacc
Apply suggestions from code review
TimonDB Aug 10, 2021
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
22 changes: 7 additions & 15 deletions app/assets/javascripts/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,16 @@ function updateArrayURLParameter(url, param, _paramVals) {
}

function getURLParameter(_name, _url) {
TimonDB marked this conversation as resolved.
Show resolved Hide resolved
const url = _url || window.location.href;
const name = _name.replace(/[[\]]/g, "\\$&");
const regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)");
const results = regex.exec(url);
if (!results) return null;
if (!results[2]) return "";
return decodeURIComponent(results[2].replace(/\+/g, " "));
const url = new URL(_url || window.location.href);
bmesuere marked this conversation as resolved.
Show resolved Hide resolved
const result = url.searchParams.get(_name);
TimonDB marked this conversation as resolved.
Show resolved Hide resolved
if (!result) return null;
return result;
}

function getArrayURLParameter(name, _url) {
const url = _url || window.location.href;
const result = [];
for (const part of url.split(/[?&]/)) {
const regResults = new RegExp(`${name}%5B%5D=([^#]+)`).exec(part);
if (regResults && regResults[1]) {
result.push(decodeURIComponent(regResults[1]));
}
}
const url = new URL(_url || window.location.href);
const result = url.searchParams.getAll(name);
TimonDB marked this conversation as resolved.
Show resolved Hide resolved
if (!result) return [];
return result;
}

Expand Down