Added new _host property for consumption.
This commit is contained in:
parent
8223011248
commit
b53046d0d9
|
@ -26,6 +26,7 @@ export class LoginUriView implements View {
|
|||
private _uri: string = null;
|
||||
private _domain: string = null;
|
||||
private _hostname: string = null;
|
||||
private _host: string = null;
|
||||
private _canLaunch: boolean = null;
|
||||
// tslint:enable
|
||||
|
||||
|
@ -62,7 +63,7 @@ export class LoginUriView implements View {
|
|||
return null;
|
||||
}
|
||||
if (this._hostname == null && this.uri != null) {
|
||||
this._hostname = Utils.getHost(this.uri);
|
||||
this._hostname = Utils.getHostname(this.uri);
|
||||
if (this._hostname === '') {
|
||||
this._hostname = null;
|
||||
}
|
||||
|
@ -71,10 +72,28 @@ export class LoginUriView implements View {
|
|||
return this._hostname;
|
||||
}
|
||||
|
||||
get host(): string {
|
||||
if (this.match === UriMatchType.RegularExpression) {
|
||||
return null;
|
||||
}
|
||||
if (this._host == null && this.uri != null) {
|
||||
this._host = Utils.getHost(this.uri);
|
||||
if (this._host === '') {
|
||||
this._host = null;
|
||||
}
|
||||
}
|
||||
|
||||
return this._host;
|
||||
}
|
||||
|
||||
get hostnameOrUri(): string {
|
||||
return this.hostname != null ? this.hostname : this.uri;
|
||||
}
|
||||
|
||||
get hostOrUri(): string {
|
||||
return this.host != null ? this.host : this.uri;
|
||||
}
|
||||
|
||||
get isWebsite(): boolean {
|
||||
return this.uri != null && (this.uri.indexOf('http://') === 0 || this.uri.indexOf('https://') === 0 ||
|
||||
(this.uri.indexOf('://') < 0 && Utils.tldEndingRegex.test(this.uri)));
|
||||
|
|
Loading…
Reference in New Issue