Jingga/jsOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/jsOMS.git synced 2026-02-18 10:08:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed url parsing bugs

Browse Source 
Introduced self url
Removing double parameters
This commit is contained in:
Dennis Eichhorn 2016-08-04 19:48:34 +02:00
parent c820a8944f
commit 9d51b089aa
1 changed files with 74 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Uri/UriFactory.js
View File

@ -119,6 +119,49 @@
return false;
};
/**
* Remove multiple definitions of the same parameter
*
* The parameters will be recognized from right to left since it's easier to push at the end.
*
* @param {string} url Url
*
* @return {string}
*
* @function
*
* @since 1.0.0
* @author Dennis Eichhorn <d.eichhorn@oms.com>
*/
jsOMS.Uri.UriFactory.unique = function (url)
{
let parts = url.split('?');
if (parts.length >= 2) {
let full = parts[1],
pars = full.split('&'),
comps = {},
spl = null,
length = pars.length;
for (let i = 0; i < length; i++) {
spl = pars[i].split('=');
comps[spl[0]] = spl[1];
}
pars = [];
for (let a in comps) {
if (comps.hasOwnProperty(a)) {
pars.push(a + '=' + comps[a]);
}
}
url = parts[0] + '?' + pars.join('&');
}
return url;
};
/**
* Build uri
*
@ -128,6 +171,7 @@
* ? = Current query
* @ =
* $ = Other data
* % = Current url
*
* @param {string} uri Raw uri
* @param {Object} toMatch Key/value pair to replace in raw
@ -139,15 +183,14 @@
*/
jsOMS.Uri.UriFactory.build = function (uri, toMatch)
{
let current = jsOMS.Uri.UriFactory.parseUrl(window.location.href);
return uri.replace(new RegExp('\{[\/#\?@\.\$][a-zA-Z0-9]*\}', 'g'), function (match)
let current = jsOMS.Uri.UriFactory.parseUrl(window.location.href),
parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$][a-zA-Z0-9\-]*\}', 'g'), function (match)
{
match = match.substr(1, match.length - 2);
if (typeof toMatch !== 'undefined' && toMatch.hasProperty(match)) {
return toMatch[match];
} else if (jsOMS.Uri.UriFactory.uri[match] !== 'undefined') {
} else if (typeof jsOMS.Uri.UriFactory.uri[match] !== 'undefined') {
return jsOMS.Uri.UriFactory.uri[match];
} else if (match.indexOf('#') === 0) {
return document.getElementById(match.substr(1)).value;
@ -156,9 +199,19 @@
} else if (match.indexOf('/') === 0) {
// todo: second match should return second path
return 'ERROR PATH';
} else if (match === '%') {
return window.location.href;
} else {
return match;
}
});
if (parsed.indexOf('?') === -1) {
parsed = parsed.replace('&', '?');
}
parsed = jsOMS.Uri.UriFactory.unique(parsed);
return parsed;
};
}(window.jsOMS = window.jsOMS || {}));