Merge pull request #14271 from calixteman/params
Parse query string in using URLSearchParams
This commit is contained in:
commit
7a428345db
@ -405,14 +405,8 @@ var Driver = (function DriverClosure() {
|
||||
|
||||
Driver.prototype = {
|
||||
_getQueryStringParameters: function Driver_getQueryStringParameters() {
|
||||
var queryString = window.location.search.substring(1);
|
||||
var values = queryString.split("&");
|
||||
var parameters = {};
|
||||
for (var i = 0, ii = values.length; i < ii; i++) {
|
||||
var value = values[i].split("=");
|
||||
parameters[unescape(value[0])] = unescape(value[1]);
|
||||
}
|
||||
return parameters;
|
||||
const queryString = window.location.search.substring(1);
|
||||
return Object.fromEntries(new URLSearchParams(queryString).entries());
|
||||
},
|
||||
|
||||
run: function Driver_run() {
|
||||
|
@ -53,11 +53,8 @@ window.onload = function () {
|
||||
function hashParameters() {
|
||||
const query = window.location.hash.substring(1);
|
||||
const params = new Map();
|
||||
for (const part of query.split(/[&;]/)) {
|
||||
const param = part.split("="),
|
||||
key = param[0].toLowerCase(),
|
||||
value = param.length > 1 ? param[1] : "";
|
||||
params.set(decodeURIComponent(key), decodeURIComponent(value));
|
||||
for (const [key, value] of new URLSearchParams(query)) {
|
||||
params.set(key.toLowerCase(), value);
|
||||
}
|
||||
return params;
|
||||
}
|
||||
|
@ -187,11 +187,8 @@ function watchScroll(viewAreaElement, callback) {
|
||||
*/
|
||||
function parseQueryString(query) {
|
||||
const params = new Map();
|
||||
for (const part of query.split("&")) {
|
||||
const param = part.split("="),
|
||||
key = param[0].toLowerCase(),
|
||||
value = param.length > 1 ? param[1] : "";
|
||||
params.set(decodeURIComponent(key), decodeURIComponent(value));
|
||||
for (const [key, value] of new URLSearchParams(query)) {
|
||||
params.set(key.toLowerCase(), value);
|
||||
}
|
||||
return params;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user