Merge pull request #14271 from calixteman/params

Parse query string in using URLSearchParams
This commit is contained in:
Jonas Jenwald 2021-11-13 22:59:34 +01:00 committed by GitHub
commit 7a428345db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 18 deletions

View File

@ -405,14 +405,8 @@ var Driver = (function DriverClosure() {
Driver.prototype = { Driver.prototype = {
_getQueryStringParameters: function Driver_getQueryStringParameters() { _getQueryStringParameters: function Driver_getQueryStringParameters() {
var queryString = window.location.search.substring(1); const queryString = window.location.search.substring(1);
var values = queryString.split("&"); return Object.fromEntries(new URLSearchParams(queryString).entries());
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;
}, },
run: function Driver_run() { run: function Driver_run() {

View File

@ -53,11 +53,8 @@ window.onload = function () {
function hashParameters() { function hashParameters() {
const query = window.location.hash.substring(1); const query = window.location.hash.substring(1);
const params = new Map(); const params = new Map();
for (const part of query.split(/[&;]/)) { for (const [key, value] of new URLSearchParams(query)) {
const param = part.split("="), params.set(key.toLowerCase(), value);
key = param[0].toLowerCase(),
value = param.length > 1 ? param[1] : "";
params.set(decodeURIComponent(key), decodeURIComponent(value));
} }
return params; return params;
} }

View File

@ -187,11 +187,8 @@ function watchScroll(viewAreaElement, callback) {
*/ */
function parseQueryString(query) { function parseQueryString(query) {
const params = new Map(); const params = new Map();
for (const part of query.split("&")) { for (const [key, value] of new URLSearchParams(query)) {
const param = part.split("="), params.set(key.toLowerCase(), value);
key = param[0].toLowerCase(),
value = param.length > 1 ? param[1] : "";
params.set(decodeURIComponent(key), decodeURIComponent(value));
} }
return params; return params;
} }