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

rename http to httpuri

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-02-12 18:39:24 +01:00
parent 32856280b4
commit af5ed7225d
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/Component/Tab.js
View File

@ -1,4 +1,4 @@
import { Http } from '../../Uri/Http.js'; import { Http } from '../../Uri/HttpUri.js';
import { UriFactory } from '../../Uri/UriFactory.js'; import { UriFactory } from '../../Uri/UriFactory.js';
/** /**
@ -65,7 +65,7 @@ export class Tab
for (let i = 0; i < length; ++i) { for (let i = 0; i < length; ++i) {
nodes[i].addEventListener('click', function (evt) nodes[i].addEventListener('click', function (evt)
{ {
let fragmentString = window.location.href.includes('#') ? Http.parseUrl(window.location.href).fragment : ''; let fragmentString = window.location.href.includes('#') ? HttpUri.parseUrl(window.location.href).fragment : '';
/* Change Tab */ /* Change Tab */
/* Remove selected tab */ /* Remove selected tab */
@ -121,7 +121,7 @@ export class Tab
*/ */
activateTabUri(e) activateTabUri(e)
{ {
const fragmentString = window.location.href.includes('#') ? Http.parseUrl(window.location.href).fragment : ''; const fragmentString = window.location.href.includes('#') ? HttpUri.parseUrl(window.location.href).fragment : '';
const fragments = fragmentString.split(','), const fragments = fragmentString.split(','),
fragLength = fragments.length; fragLength = fragments.length;

6
Uri/Http.js → Uri/HttpUri.js
View File

@ -8,7 +8,7 @@
* @version 1.0.0 * @version 1.0.0
* @since 1.0.0 * @since 1.0.0
*/ */
export class Http export class HttpUri
{ {
/** /**
* @constructor * @constructor
@ -149,7 +149,7 @@ export class Http
{ {
this.uri = uri; this.uri = uri;
const parsed = Http.parseUrl(this.uri, 'php'); const parsed = HttpUri.parseUrl(this.uri, 'php');
this.scheme = parsed['scheme']; this.scheme = parsed['scheme'];
this.host = parsed['host']; this.host = parsed['host'];
@ -165,7 +165,7 @@ export class Http
this.queryString = typeof parsed['query'] !== 'undefined' ? parsed['query'] : []; this.queryString = typeof parsed['query'] !== 'undefined' ? parsed['query'] : [];
if (this.queryString !== null) { if (this.queryString !== null) {
this.query = Http.getAllUriQueryParameters(this.queryString); this.query =HttpUri.getAllUriQueryParameters(this.queryString);
} }
this.fragment = typeof parsed['fragment'] !== 'undefined' ? parsed['fragment'] : ''; this.fragment = typeof parsed['fragment'] !== 'undefined' ? parsed['fragment'] : '';

6
Uri/UriFactory.js
View File

@ -1,4 +1,4 @@
import { Http } from './Http.js'; import { HttpUri } from './HttpUri.js';
import { FormView } from './../Views//FormView.js'; import { FormView } from './../Views//FormView.js';
/** /**
@ -178,7 +178,7 @@ export class UriFactory
*/ */
static build (uri, toMatch) static build (uri, toMatch)
{ {
const current = Http.parseUrl(window.location.href); const current = HttpUri.parseUrl(window.location.href);
let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$][a-zA-Z0-9\-]*\}', 'g'), function (match) let parsed = uri.replace(new RegExp('\{[\/#\?%@\.\$][a-zA-Z0-9\-]*\}', 'g'), function (match)
{ {
match = match.substr(1, match.length - 2); match = match.substr(1, match.length - 2);
@ -207,7 +207,7 @@ export class UriFactory
return ''; return '';
} else if (match.indexOf('?') === 0) { } else if (match.indexOf('?') === 0) {
return Http.getUriQueryParameter(current.query, match.substr(1)); returnHttpUri.getUriQueryParameter(current.query, match.substr(1));
} else if (match.indexOf('/') === 0) { } else if (match.indexOf('/') === 0) {
return 'ERROR PATH'; return 'ERROR PATH';
} else if (match === '%') { } else if (match === '%') {

16
tests/Uri/HttpTest.js → tests/Uri/HttpUriTest.js
View File

@ -1,4 +1,4 @@
import { Http } from '../../Uri/Http.js'; import { HttpUri } from '../../Uri/HttpUri.js';
describe('HttpTest', function () describe('HttpTest', function ()
{ {
@ -8,7 +8,7 @@ describe('HttpTest', function ()
{ {
it('Testing php parsing mode', function () it('Testing php parsing mode', function ()
{ {
let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php'); let parsed = HttpUri.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php');
expect(parsed.scheme).toBe('http'); expect(parsed.scheme).toBe('http');
expect(parsed.user).toBe('username'); expect(parsed.user).toBe('username');
@ -22,7 +22,7 @@ describe('HttpTest', function ()
it('Testing strict parsing mode', function () it('Testing strict parsing mode', function ()
{ {
let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'strict'); let parsed = HttpUri.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'strict');
expect(parsed.scheme).toBe('http'); expect(parsed.scheme).toBe('http');
expect(parsed.user).toBe('username'); expect(parsed.user).toBe('username');
@ -36,7 +36,7 @@ describe('HttpTest', function ()
it('Testing loose parsing mode', function () it('Testing loose parsing mode', function ()
{ {
let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'loose'); let parsed = HttpUri.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'loose');
expect(parsed.scheme).toBe('http'); expect(parsed.scheme).toBe('http');
expect(parsed.user).toBe('username'); expect(parsed.user).toBe('username');
@ -52,7 +52,7 @@ describe('HttpTest', function ()
{ {
let thrown = function () let thrown = function ()
{ {
Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'invalid'); HttpUri.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'invalid');
}; };
expect(thrown).toThrowError(Error, 'Unexpected parsing mode.'); expect(thrown).toThrowError(Error, 'Unexpected parsing mode.');
}); });
@ -62,12 +62,12 @@ describe('HttpTest', function ()
{ {
it('Testing query extraction', function () it('Testing query extraction', function ()
{ {
let parsed = Http.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php'); let parsed = HttpUri.parseUrl('http://username:password@example.com:8080/test/path?test=123&two=ha#frag', 'php');
let query = Http.getUriQueryParameter(parsed.query, 'test'); let query =HttpUri.getUriQueryParameter(parsed.query, 'test');
expect(query).toBe('123'); expect(query).toBe('123');
query = Http.getUriQueryParameter(parsed.query, 'two'); query =HttpUri.getUriQueryParameter(parsed.query, 'two');
expect(query).toBe('ha'); expect(query).toBe('ha');
}); });
}); });