@skyux/router 5.0.1 → 5.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/skyux-router.umd.js +53 -54
- package/bundles/skyux-router.umd.js.map +1 -1
- package/documentation.json +17 -17
- package/esm2015/modules/href/href-resolver.js +1 -1
- package/esm2015/modules/href/href-resolver.service.js +5 -5
- package/esm2015/modules/href/href.directive.js +27 -19
- package/esm2015/modules/href/href.module.js +6 -6
- package/esm2015/modules/link/link-external.directive.js +10 -11
- package/esm2015/modules/link/link.directive.js +7 -7
- package/esm2015/modules/link/link.module.js +7 -15
- package/fesm2015/skyux-router.js +53 -54
- package/fesm2015/skyux-router.js.map +1 -1
- package/package.json +6 -6
|
@@ -7,13 +7,13 @@ export class SkyHrefResolverService {
|
|
|
7
7
|
resolveHref(args) {
|
|
8
8
|
return Promise.resolve({
|
|
9
9
|
url: args.url,
|
|
10
|
-
userHasAccess: true
|
|
10
|
+
userHasAccess: true,
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
SkyHrefResolverService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
15
|
-
SkyHrefResolverService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.
|
|
16
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
14
|
+
SkyHrefResolverService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefResolverService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
15
|
+
SkyHrefResolverService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefResolverService });
|
|
16
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefResolverService, decorators: [{
|
|
17
17
|
type: Injectable
|
|
18
18
|
}] });
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
19
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHJlZi1yZXNvbHZlci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvcm91dGVyL3NyYy9tb2R1bGVzL2hyZWYvaHJlZi1yZXNvbHZlci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7O0FBTTNDOztHQUVHO0FBRUgsTUFBTSxPQUFPLHNCQUFzQjtJQUMxQixXQUFXLENBQUMsSUFBeUI7UUFDMUMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFVO1lBQzlCLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRztZQUNiLGFBQWEsRUFBRSxJQUFJO1NBQ3BCLENBQUMsQ0FBQztJQUNMLENBQUM7O29IQU5VLHNCQUFzQjt3SEFBdEIsc0JBQXNCOzRGQUF0QixzQkFBc0I7a0JBRGxDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IFNreUhyZWZSZXNvbHZlciB9IGZyb20gJy4vaHJlZi1yZXNvbHZlcic7XG5pbXBvcnQgeyBTa3lIcmVmIH0gZnJvbSAnLi90eXBlcy9ocmVmJztcbmltcG9ydCB7IFNreUhyZWZSZXNvbHZlckFyZ3MgfSBmcm9tICcuL3R5cGVzL2hyZWYtcmVzb2x2ZXIuYXJncyc7XG5cbi8qKlxuICogUmV0dXJuIHRoZSBsaW5rIGFzLWlzLlxuICovXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgU2t5SHJlZlJlc29sdmVyU2VydmljZSBpbXBsZW1lbnRzIFNreUhyZWZSZXNvbHZlciB7XG4gIHB1YmxpYyByZXNvbHZlSHJlZihhcmdzOiBTa3lIcmVmUmVzb2x2ZXJBcmdzKTogUHJvbWlzZTxTa3lIcmVmPiB7XG4gICAgcmV0dXJuIFByb21pc2UucmVzb2x2ZTxTa3lIcmVmPih7XG4gICAgICB1cmw6IGFyZ3MudXJsLFxuICAgICAgdXNlckhhc0FjY2VzczogdHJ1ZSxcbiAgICB9KTtcbiAgfVxufVxuIl19
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HttpParams } from '@angular/common/http';
|
|
2
|
-
import { Directive, HostListener, Input, Optional } from '@angular/core';
|
|
2
|
+
import { Directive, HostListener, Input, Optional, } from '@angular/core';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "@angular/router";
|
|
5
5
|
import * as i2 from "@skyux/config";
|
|
@@ -72,15 +72,13 @@ export class SkyHrefDirective {
|
|
|
72
72
|
checkRouteAccess() {
|
|
73
73
|
this._route = {
|
|
74
74
|
url: this._skyHref,
|
|
75
|
-
userHasAccess: false
|
|
75
|
+
userHasAccess: false,
|
|
76
76
|
};
|
|
77
77
|
/* istanbul ignore else */
|
|
78
78
|
if (this.hrefResolver && this._skyHref) {
|
|
79
79
|
this.applyChanges(this.getChanges());
|
|
80
80
|
try {
|
|
81
|
-
this.hrefResolver
|
|
82
|
-
.resolveHref({ url: this._skyHref })
|
|
83
|
-
.then((route) => {
|
|
81
|
+
this.hrefResolver.resolveHref({ url: this._skyHref }).then((route) => {
|
|
84
82
|
this._route = Object.assign({}, route);
|
|
85
83
|
this.applyChanges(this.getChanges());
|
|
86
84
|
});
|
|
@@ -100,7 +98,7 @@ export class SkyHrefDirective {
|
|
|
100
98
|
if (!this._route || !this._route.userHasAccess) {
|
|
101
99
|
return {
|
|
102
100
|
href: '',
|
|
103
|
-
hidden: this._skyHrefElse === 'hide'
|
|
101
|
+
hidden: this._skyHrefElse === 'hide',
|
|
104
102
|
};
|
|
105
103
|
}
|
|
106
104
|
else {
|
|
@@ -113,14 +111,17 @@ export class SkyHrefDirective {
|
|
|
113
111
|
});
|
|
114
112
|
}
|
|
115
113
|
const queryParamsMerged = new HttpParams({
|
|
116
|
-
fromObject: Object.assign({}, this.getSkyuxParams(), queryParams)
|
|
114
|
+
fromObject: Object.assign({}, this.getSkyuxParams(), queryParams),
|
|
117
115
|
});
|
|
118
|
-
this._href =
|
|
119
|
-
|
|
120
|
-
|
|
116
|
+
this._href =
|
|
117
|
+
baseUrl +
|
|
118
|
+
(queryParamsMerged.keys().length > 0
|
|
119
|
+
? '?' + queryParamsMerged.toString()
|
|
120
|
+
: '') +
|
|
121
|
+
(fragment ? `#${fragment}` : '');
|
|
121
122
|
return {
|
|
122
123
|
href: this._href,
|
|
123
|
-
hidden: false
|
|
124
|
+
hidden: false,
|
|
124
125
|
};
|
|
125
126
|
}
|
|
126
127
|
}
|
|
@@ -134,7 +135,9 @@ export class SkyHrefDirective {
|
|
|
134
135
|
getUrlTree() {
|
|
135
136
|
var _a, _b, _c, _d, _e;
|
|
136
137
|
const href = this._href.toLowerCase();
|
|
137
|
-
if (!href ||
|
|
138
|
+
if (!href ||
|
|
139
|
+
!((_b = (_a = this.skyAppConfig) === null || _a === void 0 ? void 0 : _a.skyux.host) === null || _b === void 0 ? void 0 : _b.url) ||
|
|
140
|
+
!((_e = (_d = (_c = this.skyAppConfig) === null || _c === void 0 ? void 0 : _c.runtime) === null || _d === void 0 ? void 0 : _d.app) === null || _e === void 0 ? void 0 : _e.base)) {
|
|
138
141
|
return false;
|
|
139
142
|
}
|
|
140
143
|
const baseUrl = (this.skyAppConfig.skyux.host.url +
|
|
@@ -150,12 +153,12 @@ export class SkyHrefDirective {
|
|
|
150
153
|
return false;
|
|
151
154
|
}
|
|
152
155
|
}
|
|
153
|
-
SkyHrefDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
154
|
-
SkyHrefDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.
|
|
155
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
156
|
+
SkyHrefDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefDirective, deps: [{ token: i1.Router }, { token: i0.Renderer2 }, { token: i0.ElementRef }, { token: i2.SkyAppConfig, optional: true }, { token: i2.SkyAppRuntimeConfigParamsProvider, optional: true }, { token: i3.SkyHrefResolverService, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
157
|
+
SkyHrefDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.13", type: SkyHrefDirective, selector: "[skyHref]", inputs: { skyHref: "skyHref", skyHrefElse: "skyHrefElse" }, host: { listeners: { "click": "onClick($event.button,$event.ctrlKey,$event.shiftKey,$event.altKey,$event.metaKey)" } }, ngImport: i0 });
|
|
158
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefDirective, decorators: [{
|
|
156
159
|
type: Directive,
|
|
157
160
|
args: [{
|
|
158
|
-
selector: '[skyHref]'
|
|
161
|
+
selector: '[skyHref]',
|
|
159
162
|
}]
|
|
160
163
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i0.Renderer2 }, { type: i0.ElementRef }, { type: i2.SkyAppConfig, decorators: [{
|
|
161
164
|
type: Optional
|
|
@@ -169,7 +172,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImpor
|
|
|
169
172
|
type: Input
|
|
170
173
|
}], onClick: [{
|
|
171
174
|
type: HostListener,
|
|
172
|
-
args: ['click',
|
|
173
|
-
|
|
175
|
+
args: ['click', [
|
|
176
|
+
'$event.button',
|
|
177
|
+
'$event.ctrlKey',
|
|
178
|
+
'$event.shiftKey',
|
|
179
|
+
'$event.altKey',
|
|
180
|
+
'$event.metaKey',
|
|
181
|
+
]]
|
|
174
182
|
}] } });
|
|
175
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"href.directive.js","sourceRoot":"","sources":["../../../../../projects/router/src/modules/href/href.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpParams } from '@angular/common/http';\nimport {\n  Directive,\n  ElementRef,\n  HostListener,\n  Input,\n  Optional,\n  Renderer2\n} from '@angular/core';\nimport { Router, UrlTree } from '@angular/router';\nimport { SkyAppConfig, SkyAppRuntimeConfigParamsProvider } from '@skyux/config';\n\nimport { SkyHrefQueryParams } from './href-query-params';\nimport { SkyHrefResolverService } from './href-resolver.service';\n\nimport { SkyHref } from './types/href';\n\ntype HrefChanges = { href: string, hidden: boolean };\n\n@Directive({\n  selector: '[skyHref]'\n})\nexport class SkyHrefDirective {\n  /**\n   * Provide a link as a string or as an array of strings to be joined by a slash to form a complete\n   * URL.\n   *\n   * @param skyHref\n   */\n  @Input()\n  public set skyHref(skyHref: string | string[]) {\n    if (typeof skyHref === 'string') {\n      this._skyHref = skyHref;\n    } else {\n      this._skyHref = skyHref.join('/');\n    }\n\n    this.checkRouteAccess();\n  }\n\n  @Input()\n  public set skyHrefElse(value: 'hide' | 'unlink') {\n    this._skyHrefElse = value;\n    this.applyChanges(this.getChanges());\n  }\n\n  private _route: SkyHref | false = false;\n\n  private _href: string;\n\n  private _skyHref = '';\n\n  private _skyHrefElse: 'hide' | 'unlink' = 'hide';\n\n  constructor(\n    private router: Router,\n    private renderer: Renderer2,\n    private element: ElementRef,\n    @Optional() private skyAppConfig?: SkyAppConfig,\n    @Optional() private paramsProvider?: SkyAppRuntimeConfigParamsProvider,\n    @Optional() private hrefResolver?: SkyHrefResolverService\n  ) {\n  }\n\n  /* istanbul ignore next */\n  @HostListener(\n    'click',\n    ['$event.button', '$event.ctrlKey', '$event.shiftKey', '$event.altKey', '$event.metaKey'])\n  public onClick(button: number, ctrlKey: boolean, shiftKey: boolean, altKey: boolean, metaKey: boolean):\n    boolean {\n    if (!this._route || !this._route.userHasAccess) {\n      return false;\n    }\n\n    if (button !== 0 || ctrlKey || shiftKey || altKey || metaKey) {\n      return true;\n    }\n\n    const target = this.element.nativeElement.getAttribute('target');\n    if (typeof target === 'string' && target !== '_self') {\n      return true;\n    }\n\n    const urlTree = this.getUrlTree();\n    if (urlTree) {\n      this.router.navigateByUrl(urlTree);\n      return false;\n    }\n    return true;\n  }\n\n  private applyChanges(change: HrefChanges) {\n    this.renderer.addClass(this.element.nativeElement, 'sky-href');\n    if (change.hidden) {\n      this.renderer.setAttribute(this.element.nativeElement, 'hidden', 'hidden');\n    } else {\n      this.renderer.removeAttribute(this.element.nativeElement, 'hidden');\n    }\n    if (change.href) {\n      this.renderer.setAttribute(this.element.nativeElement, 'href', change.href);\n    } else {\n      this.renderer.removeAttribute(this.element.nativeElement, 'href');\n    }\n  }\n\n  private checkRouteAccess() {\n    this._route = {\n      url: this._skyHref,\n      userHasAccess: false\n    };\n    /* istanbul ignore else */\n    if (this.hrefResolver && this._skyHref) {\n      this.applyChanges(this.getChanges());\n      try {\n        this.hrefResolver\n          .resolveHref({url: this._skyHref})\n          .then((route) => {\n            this._route = {...route};\n            this.applyChanges(this.getChanges());\n          });\n      } catch (error) {\n        this.applyChanges(this.getChanges());\n      }\n    } else {\n      // no resolver or skyHref is falsy\n      this._route.userHasAccess = !!this._skyHref;\n      this.applyChanges(this.getChanges());\n    }\n  }\n\n  private getChanges(): HrefChanges {\n    let queryParams: SkyHrefQueryParams = {};\n\n    if (!this._route || !this._route.userHasAccess) {\n      return {\n        href: '',\n        hidden: this._skyHrefElse === 'hide'\n      };\n    } else {\n      const [beforeFragment, fragment] = this._route.url.split('#', 2);\n      const [baseUrl, search] = beforeFragment.split('?', 2);\n\n      if (search) {\n        const searchParams = new HttpParams({fromString: search});\n        searchParams.keys().forEach((key) => {\n          queryParams[key] = searchParams.get(key);\n        });\n      }\n\n      const queryParamsMerged = new HttpParams({\n        fromObject: Object.assign(\n          {},\n          this.getSkyuxParams(),\n          queryParams\n        )\n      });\n\n      this._href = baseUrl +\n        (queryParamsMerged.keys().length > 0 ? '?' + queryParamsMerged.toString() : '') +\n        (fragment ? `#${fragment}` : '');\n      return {\n        href: this._href,\n        hidden: false\n      };\n    }\n  }\n\n  private getSkyuxParams(): SkyHrefQueryParams {\n    return typeof this.skyAppConfig?.runtime.params?.getAll === 'function'\n      ? this.skyAppConfig.runtime.params.getAll(true)\n      : this.paramsProvider.params.getAll(true);\n  }\n\n  /* istanbul ignore next */\n  private getUrlTree(): UrlTree | false {\n    const href = this._href.toLowerCase();\n\n    if (!href || !this.skyAppConfig?.skyux.host?.url || !this.skyAppConfig?.runtime?.app?.base) {\n      return false;\n    }\n\n    const baseUrl = (\n      this.skyAppConfig.skyux.host.url +\n      this.skyAppConfig.runtime.app.base.substr(0, this.skyAppConfig.runtime.app.base.length - 1)\n    ).toLowerCase();\n\n    if (\n      href === baseUrl ||\n      // Make sure the base URL is not simply a partial match of the base URL plus additional\n      // characters after the base URL that are not \"terminating\" characters\n      href.indexOf(baseUrl + '/') === 0 ||\n      href.indexOf(baseUrl + '?') === 0\n    ) {\n      const routePath = this._href.substring(baseUrl.length);\n      return this.router.parseUrl(routePath);\n    }\n\n    return false;\n  }\n}\n"]}
|
|
183
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"href.directive.js","sourceRoot":"","sources":["../../../../../projects/router/src/modules/href/href.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpParams } from '@angular/common/http';\nimport {\n  Directive,\n  ElementRef,\n  HostListener,\n  Input,\n  Optional,\n  Renderer2,\n} from '@angular/core';\nimport { Router, UrlTree } from '@angular/router';\nimport { SkyAppConfig, SkyAppRuntimeConfigParamsProvider } from '@skyux/config';\n\nimport { SkyHrefQueryParams } from './href-query-params';\nimport { SkyHrefResolverService } from './href-resolver.service';\n\nimport { SkyHref } from './types/href';\n\ntype HrefChanges = { href: string; hidden: boolean };\n\n@Directive({\n  selector: '[skyHref]',\n})\nexport class SkyHrefDirective {\n  /**\n   * Provide a link as a string or as an array of strings to be joined by a slash to form a complete\n   * URL.\n   *\n   * @param skyHref\n   */\n  @Input()\n  public set skyHref(skyHref: string | string[]) {\n    if (typeof skyHref === 'string') {\n      this._skyHref = skyHref;\n    } else {\n      this._skyHref = skyHref.join('/');\n    }\n\n    this.checkRouteAccess();\n  }\n\n  @Input()\n  public set skyHrefElse(value: 'hide' | 'unlink') {\n    this._skyHrefElse = value;\n    this.applyChanges(this.getChanges());\n  }\n\n  private _route: SkyHref | false = false;\n\n  private _href: string;\n\n  private _skyHref = '';\n\n  private _skyHrefElse: 'hide' | 'unlink' = 'hide';\n\n  constructor(\n    private router: Router,\n    private renderer: Renderer2,\n    private element: ElementRef,\n    @Optional() private skyAppConfig?: SkyAppConfig,\n    @Optional() private paramsProvider?: SkyAppRuntimeConfigParamsProvider,\n    @Optional() private hrefResolver?: SkyHrefResolverService\n  ) {}\n\n  /* istanbul ignore next */\n  @HostListener('click', [\n    '$event.button',\n    '$event.ctrlKey',\n    '$event.shiftKey',\n    '$event.altKey',\n    '$event.metaKey',\n  ])\n  public onClick(\n    button: number,\n    ctrlKey: boolean,\n    shiftKey: boolean,\n    altKey: boolean,\n    metaKey: boolean\n  ): boolean {\n    if (!this._route || !this._route.userHasAccess) {\n      return false;\n    }\n\n    if (button !== 0 || ctrlKey || shiftKey || altKey || metaKey) {\n      return true;\n    }\n\n    const target = this.element.nativeElement.getAttribute('target');\n    if (typeof target === 'string' && target !== '_self') {\n      return true;\n    }\n\n    const urlTree = this.getUrlTree();\n    if (urlTree) {\n      this.router.navigateByUrl(urlTree);\n      return false;\n    }\n    return true;\n  }\n\n  private applyChanges(change: HrefChanges) {\n    this.renderer.addClass(this.element.nativeElement, 'sky-href');\n    if (change.hidden) {\n      this.renderer.setAttribute(\n        this.element.nativeElement,\n        'hidden',\n        'hidden'\n      );\n    } else {\n      this.renderer.removeAttribute(this.element.nativeElement, 'hidden');\n    }\n    if (change.href) {\n      this.renderer.setAttribute(\n        this.element.nativeElement,\n        'href',\n        change.href\n      );\n    } else {\n      this.renderer.removeAttribute(this.element.nativeElement, 'href');\n    }\n  }\n\n  private checkRouteAccess() {\n    this._route = {\n      url: this._skyHref,\n      userHasAccess: false,\n    };\n    /* istanbul ignore else */\n    if (this.hrefResolver && this._skyHref) {\n      this.applyChanges(this.getChanges());\n      try {\n        this.hrefResolver.resolveHref({ url: this._skyHref }).then((route) => {\n          this._route = { ...route };\n          this.applyChanges(this.getChanges());\n        });\n      } catch (error) {\n        this.applyChanges(this.getChanges());\n      }\n    } else {\n      // no resolver or skyHref is falsy\n      this._route.userHasAccess = !!this._skyHref;\n      this.applyChanges(this.getChanges());\n    }\n  }\n\n  private getChanges(): HrefChanges {\n    let queryParams: SkyHrefQueryParams = {};\n\n    if (!this._route || !this._route.userHasAccess) {\n      return {\n        href: '',\n        hidden: this._skyHrefElse === 'hide',\n      };\n    } else {\n      const [beforeFragment, fragment] = this._route.url.split('#', 2);\n      const [baseUrl, search] = beforeFragment.split('?', 2);\n\n      if (search) {\n        const searchParams = new HttpParams({ fromString: search });\n        searchParams.keys().forEach((key) => {\n          queryParams[key] = searchParams.get(key);\n        });\n      }\n\n      const queryParamsMerged = new HttpParams({\n        fromObject: Object.assign({}, this.getSkyuxParams(), queryParams),\n      });\n\n      this._href =\n        baseUrl +\n        (queryParamsMerged.keys().length > 0\n          ? '?' + queryParamsMerged.toString()\n          : '') +\n        (fragment ? `#${fragment}` : '');\n      return {\n        href: this._href,\n        hidden: false,\n      };\n    }\n  }\n\n  private getSkyuxParams(): SkyHrefQueryParams {\n    return typeof this.skyAppConfig?.runtime.params?.getAll === 'function'\n      ? this.skyAppConfig.runtime.params.getAll(true)\n      : this.paramsProvider.params.getAll(true);\n  }\n\n  /* istanbul ignore next */\n  private getUrlTree(): UrlTree | false {\n    const href = this._href.toLowerCase();\n\n    if (\n      !href ||\n      !this.skyAppConfig?.skyux.host?.url ||\n      !this.skyAppConfig?.runtime?.app?.base\n    ) {\n      return false;\n    }\n\n    const baseUrl = (\n      this.skyAppConfig.skyux.host.url +\n      this.skyAppConfig.runtime.app.base.substr(\n        0,\n        this.skyAppConfig.runtime.app.base.length - 1\n      )\n    ).toLowerCase();\n\n    if (\n      href === baseUrl ||\n      // Make sure the base URL is not simply a partial match of the base URL plus additional\n      // characters after the base URL that are not \"terminating\" characters\n      href.indexOf(baseUrl + '/') === 0 ||\n      href.indexOf(baseUrl + '?') === 0\n    ) {\n      const routePath = this._href.substring(baseUrl.length);\n      return this.router.parseUrl(routePath);\n    }\n\n    return false;\n  }\n}\n"]}
|
|
@@ -4,15 +4,15 @@ import { SkyHrefDirective } from './href.directive';
|
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
export class SkyHrefModule {
|
|
6
6
|
}
|
|
7
|
-
SkyHrefModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
8
|
-
SkyHrefModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.
|
|
9
|
-
SkyHrefModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.
|
|
10
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
7
|
+
SkyHrefModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
8
|
+
SkyHrefModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, declarations: [SkyHrefDirective], imports: [CommonModule], exports: [SkyHrefDirective] });
|
|
9
|
+
SkyHrefModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, imports: [[CommonModule]] });
|
|
10
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, decorators: [{
|
|
11
11
|
type: NgModule,
|
|
12
12
|
args: [{
|
|
13
13
|
declarations: [SkyHrefDirective],
|
|
14
14
|
exports: [SkyHrefDirective],
|
|
15
|
-
imports: [CommonModule]
|
|
15
|
+
imports: [CommonModule],
|
|
16
16
|
}]
|
|
17
17
|
}] });
|
|
18
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHJlZi5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9yb3V0ZXIvc3JjL21vZHVsZXMvaHJlZi9ocmVmLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFDL0MsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUV6QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQzs7QUFPcEQsTUFBTSxPQUFPLGFBQWE7OzJHQUFiLGFBQWE7NEdBQWIsYUFBYSxpQkFKVCxnQkFBZ0IsYUFFckIsWUFBWSxhQURaLGdCQUFnQjs0R0FHZixhQUFhLFlBRmYsQ0FBQyxZQUFZLENBQUM7NEZBRVosYUFBYTtrQkFMekIsUUFBUTttQkFBQztvQkFDUixZQUFZLEVBQUUsQ0FBQyxnQkFBZ0IsQ0FBQztvQkFDaEMsT0FBTyxFQUFFLENBQUMsZ0JBQWdCLENBQUM7b0JBQzNCLE9BQU8sRUFBRSxDQUFDLFlBQVksQ0FBQztpQkFDeEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21tb25Nb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuaW1wb3J0IHsgTmdNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcblxuaW1wb3J0IHsgU2t5SHJlZkRpcmVjdGl2ZSB9IGZyb20gJy4vaHJlZi5kaXJlY3RpdmUnO1xuXG5ATmdNb2R1bGUoe1xuICBkZWNsYXJhdGlvbnM6IFtTa3lIcmVmRGlyZWN0aXZlXSxcbiAgZXhwb3J0czogW1NreUhyZWZEaXJlY3RpdmVdLFxuICBpbXBvcnRzOiBbQ29tbW9uTW9kdWxlXSxcbn0pXG5leHBvcnQgY2xhc3MgU2t5SHJlZk1vZHVsZSB7fVxuIl19
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Directive, Input, Optional } from '@angular/core';
|
|
1
|
+
import { Directive, Input, Optional, } from '@angular/core';
|
|
2
2
|
import { PathLocationStrategy } from '@angular/common';
|
|
3
3
|
import { RouterLinkWithHref } from '@angular/router';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
@@ -11,13 +11,12 @@ import * as i4 from "@skyux/config";
|
|
|
11
11
|
*/
|
|
12
12
|
export class SkyAppLinkExternalDirective extends RouterLinkWithHref {
|
|
13
13
|
constructor(router, route, platformLocation, window, skyAppConfig, paramsProvider, hostConfig) {
|
|
14
|
-
super(router, route, new PathLocationStrategy(platformLocation,
|
|
15
|
-
? hostConfig.host.url
|
|
16
|
-
: skyAppConfig.skyux.host.url));
|
|
14
|
+
super(router, route, new PathLocationStrategy(platformLocation, hostConfig ? hostConfig.host.url : skyAppConfig.skyux.host.url));
|
|
17
15
|
this.window = window;
|
|
18
16
|
this.skyAppConfig = skyAppConfig;
|
|
19
17
|
this.paramsProvider = paramsProvider;
|
|
20
|
-
if (this.window.nativeWindow.window.name &&
|
|
18
|
+
if (this.window.nativeWindow.window.name &&
|
|
19
|
+
this.window.nativeWindow.window.name !== '') {
|
|
21
20
|
this.target = this.window.nativeWindow.window.name;
|
|
22
21
|
}
|
|
23
22
|
else {
|
|
@@ -33,18 +32,18 @@ export class SkyAppLinkExternalDirective extends RouterLinkWithHref {
|
|
|
33
32
|
super.ngOnChanges(changes);
|
|
34
33
|
}
|
|
35
34
|
mergeQueryParams(queryParams) {
|
|
36
|
-
const skyuxParams =
|
|
35
|
+
const skyuxParams = this.skyAppConfig
|
|
37
36
|
? this.skyAppConfig.runtime.params.getAll()
|
|
38
37
|
: this.paramsProvider.params.getAll();
|
|
39
38
|
return Object.assign({}, this.queryParams, queryParams, skyuxParams);
|
|
40
39
|
}
|
|
41
40
|
}
|
|
42
|
-
SkyAppLinkExternalDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
43
|
-
SkyAppLinkExternalDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.
|
|
44
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
41
|
+
SkyAppLinkExternalDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkExternalDirective, deps: [{ token: i1.Router }, { token: i1.ActivatedRoute }, { token: i2.PlatformLocation }, { token: i3.SkyAppWindowRef }, { token: i4.SkyAppConfig, optional: true }, { token: i4.SkyAppRuntimeConfigParamsProvider, optional: true }, { token: i4.SkyAppConfigHost, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
42
|
+
SkyAppLinkExternalDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.13", type: SkyAppLinkExternalDirective, selector: "[skyAppLinkExternal]", inputs: { skyAppLinkExternal: "skyAppLinkExternal" }, usesInheritance: true, usesOnChanges: true, ngImport: i0 });
|
|
43
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkExternalDirective, decorators: [{
|
|
45
44
|
type: Directive,
|
|
46
45
|
args: [{
|
|
47
|
-
selector: '[skyAppLinkExternal]'
|
|
46
|
+
selector: '[skyAppLinkExternal]',
|
|
48
47
|
}]
|
|
49
48
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i1.ActivatedRoute }, { type: i2.PlatformLocation }, { type: i3.SkyAppWindowRef }, { type: i4.SkyAppConfig, decorators: [{
|
|
50
49
|
type: Optional
|
|
@@ -55,4 +54,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImpor
|
|
|
55
54
|
}] }]; }, propDecorators: { skyAppLinkExternal: [{
|
|
56
55
|
type: Input
|
|
57
56
|
}] } });
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGluay1leHRlcm5hbC5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9yb3V0ZXIvc3JjL21vZHVsZXMvbGluay9saW5rLWV4dGVybmFsLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsU0FBUyxFQUNULEtBQUssRUFFTCxRQUFRLEdBRVQsTUFBTSxlQUFlLENBQUM7QUFFdkIsT0FBTyxFQUFFLG9CQUFvQixFQUFvQixNQUFNLGlCQUFpQixDQUFDO0FBRXpFLE9BQU8sRUFBMEIsa0JBQWtCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQzs7Ozs7O0FBWTdFOztHQUVHO0FBSUgsTUFBTSxPQUFPLDJCQUNYLFNBQVEsa0JBQWtCO0lBUTFCLFlBQ0UsTUFBYyxFQUNkLEtBQXFCLEVBQ3JCLGdCQUFrQyxFQUMxQixNQUF1QixFQUNYLFlBQTJCLEVBQzNCLGNBQWtELEVBQzFELFVBQTZCO1FBRXpDLEtBQUssQ0FDSCxNQUFNLEVBQ04sS0FBSyxFQUNMLElBQUksb0JBQW9CLENBQ3RCLGdCQUFnQixFQUNoQixVQUFVLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQy9ELENBQ0YsQ0FBQztRQVpNLFdBQU0sR0FBTixNQUFNLENBQWlCO1FBQ1gsaUJBQVksR0FBWixZQUFZLENBQWU7UUFDM0IsbUJBQWMsR0FBZCxjQUFjLENBQW9DO1FBWXRFLElBQ0UsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUk7WUFDcEMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxFQUFFLEVBQzNDO1lBQ0EsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO1NBQ3BEO2FBQU07WUFDTCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztTQUN0QjtJQUNILENBQUM7SUEvQkQsSUFDSSxrQkFBa0IsQ0FBQyxRQUF3QjtRQUM3QyxJQUFJLENBQUMsVUFBVSxHQUFHLFFBQVEsQ0FBQztJQUM3QixDQUFDO0lBOEJNLFdBQVcsQ0FBQyxPQUFzQjs7UUFDdkMsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBQSxPQUFPLENBQUMsV0FBVywwQ0FBRSxZQUFZLENBQUMsQ0FBQztRQUM1RSxLQUFLLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFTyxnQkFBZ0IsQ0FDdEIsV0FBa0M7UUFFbEMsTUFBTSxXQUFXLEdBQUcsSUFBSSxDQUFDLFlBQVk7WUFDbkMsQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7WUFDM0MsQ0FBQyxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRXhDLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDdkUsQ0FBQzs7eUhBbERVLDJCQUEyQjs2R0FBM0IsMkJBQTJCOzRGQUEzQiwyQkFBMkI7a0JBSHZDLFNBQVM7bUJBQUM7b0JBQ1QsUUFBUSxFQUFFLHNCQUFzQjtpQkFDakM7OzBCQWVJLFFBQVE7OzBCQUNSLFFBQVE7OzBCQUNSLFFBQVE7NENBWFAsa0JBQWtCO3NCQURyQixLQUFLIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtcbiAgRGlyZWN0aXZlLFxuICBJbnB1dCxcbiAgT25DaGFuZ2VzLFxuICBPcHRpb25hbCxcbiAgU2ltcGxlQ2hhbmdlcyxcbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmltcG9ydCB7IFBhdGhMb2NhdGlvblN0cmF0ZWd5LCBQbGF0Zm9ybUxvY2F0aW9uIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcblxuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGUsIFJvdXRlciwgUm91dGVyTGlua1dpdGhIcmVmIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcblxuaW1wb3J0IHtcbiAgU2t5QXBwQ29uZmlnLFxuICBTa3lBcHBDb25maWdIb3N0LFxuICBTa3lBcHBSdW50aW1lQ29uZmlnUGFyYW1zUHJvdmlkZXIsXG59IGZyb20gJ0Bza3l1eC9jb25maWcnO1xuXG5pbXBvcnQgeyBTa3lBcHBXaW5kb3dSZWYgfSBmcm9tICdAc2t5dXgvY29yZSc7XG5cbmltcG9ydCB7IFNreUFwcExpbmtRdWVyeVBhcmFtcyB9IGZyb20gJy4vbGluay1xdWVyeS1wYXJhbXMnO1xuXG4vKipcbiAqIEBkZXByZWNhdGVkIFVzZSBgc2t5SHJlZmAgZGlyZWN0aXZlIGluc3RlYWQuXG4gKi9cbkBEaXJlY3RpdmUoe1xuICBzZWxlY3RvcjogJ1tza3lBcHBMaW5rRXh0ZXJuYWxdJyxcbn0pXG5leHBvcnQgY2xhc3MgU2t5QXBwTGlua0V4dGVybmFsRGlyZWN0aXZlXG4gIGV4dGVuZHMgUm91dGVyTGlua1dpdGhIcmVmXG4gIGltcGxlbWVudHMgT25DaGFuZ2VzXG57XG4gIEBJbnB1dCgpXG4gIHNldCBza3lBcHBMaW5rRXh0ZXJuYWwoY29tbWFuZHM6IGFueVtdIHwgc3RyaW5nKSB7XG4gICAgdGhpcy5yb3V0ZXJMaW5rID0gY29tbWFuZHM7XG4gIH1cblxuICBjb25zdHJ1Y3RvcihcbiAgICByb3V0ZXI6IFJvdXRlcixcbiAgICByb3V0ZTogQWN0aXZhdGVkUm91dGUsXG4gICAgcGxhdGZvcm1Mb2NhdGlvbjogUGxhdGZvcm1Mb2NhdGlvbixcbiAgICBwcml2YXRlIHdpbmRvdzogU2t5QXBwV2luZG93UmVmLFxuICAgIEBPcHRpb25hbCgpIHByaXZhdGUgc2t5QXBwQ29uZmlnPzogU2t5QXBwQ29uZmlnLFxuICAgIEBPcHRpb25hbCgpIHByaXZhdGUgcGFyYW1zUHJvdmlkZXI/OiBTa3lBcHBSdW50aW1lQ29uZmlnUGFyYW1zUHJvdmlkZXIsXG4gICAgQE9wdGlvbmFsKCkgaG9zdENvbmZpZz86IFNreUFwcENvbmZpZ0hvc3RcbiAgKSB7XG4gICAgc3VwZXIoXG4gICAgICByb3V0ZXIsXG4gICAgICByb3V0ZSxcbiAgICAgIG5ldyBQYXRoTG9jYXRpb25TdHJhdGVneShcbiAgICAgICAgcGxhdGZvcm1Mb2NhdGlvbixcbiAgICAgICAgaG9zdENvbmZpZyA/IGhvc3RDb25maWcuaG9zdC51cmwgOiBza3lBcHBDb25maWcuc2t5dXguaG9zdC51cmxcbiAgICAgIClcbiAgICApO1xuXG4gICAgaWYgKFxuICAgICAgdGhpcy53aW5kb3cubmF0aXZlV2luZG93LndpbmRvdy5uYW1lICYmXG4gICAgICB0aGlzLndpbmRvdy5uYXRpdmVXaW5kb3cud2luZG93Lm5hbWUgIT09ICcnXG4gICAgKSB7XG4gICAgICB0aGlzLnRhcmdldCA9IHRoaXMud2luZG93Lm5hdGl2ZVdpbmRvdy53aW5kb3cubmFtZTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy50YXJnZXQgPSAnX3RvcCc7XG4gICAgfVxuICB9XG5cbiAgcHVibGljIG5nT25DaGFuZ2VzKGNoYW5nZXM6IFNpbXBsZUNoYW5nZXMpOiB2b2lkIHtcbiAgICB0aGlzLnF1ZXJ5UGFyYW1zID0gdGhpcy5tZXJnZVF1ZXJ5UGFyYW1zKGNoYW5nZXMucXVlcnlQYXJhbXM/LmN1cnJlbnRWYWx1ZSk7XG4gICAgc3VwZXIubmdPbkNoYW5nZXMoY2hhbmdlcyk7XG4gIH1cblxuICBwcml2YXRlIG1lcmdlUXVlcnlQYXJhbXMoXG4gICAgcXVlcnlQYXJhbXM6IFNreUFwcExpbmtRdWVyeVBhcmFtc1xuICApOiBTa3lBcHBMaW5rUXVlcnlQYXJhbXMge1xuICAgIGNvbnN0IHNreXV4UGFyYW1zID0gdGhpcy5za3lBcHBDb25maWdcbiAgICAgID8gdGhpcy5za3lBcHBDb25maWcucnVudGltZS5wYXJhbXMuZ2V0QWxsKClcbiAgICAgIDogdGhpcy5wYXJhbXNQcm92aWRlci5wYXJhbXMuZ2V0QWxsKCk7XG5cbiAgICByZXR1cm4gT2JqZWN0LmFzc2lnbih7fSwgdGhpcy5xdWVyeVBhcmFtcywgcXVlcnlQYXJhbXMsIHNreXV4UGFyYW1zKTtcbiAgfVxufVxuIl19
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Directive, Input, Optional } from '@angular/core';
|
|
1
|
+
import { Directive, Input, Optional, } from '@angular/core';
|
|
2
2
|
import { RouterLinkWithHref } from '@angular/router';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "@angular/router";
|
|
@@ -19,18 +19,18 @@ export class SkyAppLinkDirective extends RouterLinkWithHref {
|
|
|
19
19
|
super.ngOnChanges(changes);
|
|
20
20
|
}
|
|
21
21
|
mergeQueryParams(queryParams) {
|
|
22
|
-
const skyuxParams =
|
|
22
|
+
const skyuxParams = this.skyAppConfig
|
|
23
23
|
? this.skyAppConfig.runtime.params.getAll(true)
|
|
24
24
|
: this.paramsProvider.params.getAll(true);
|
|
25
25
|
return Object.assign({}, this.queryParams, queryParams, skyuxParams);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
-
SkyAppLinkDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
29
|
-
SkyAppLinkDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.
|
|
30
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
28
|
+
SkyAppLinkDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkDirective, deps: [{ token: i1.Router }, { token: i1.ActivatedRoute }, { token: i2.LocationStrategy }, { token: i3.SkyAppConfig, optional: true }, { token: i3.SkyAppRuntimeConfigParamsProvider, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
29
|
+
SkyAppLinkDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.13", type: SkyAppLinkDirective, selector: "[skyAppLink]", inputs: { skyAppLink: "skyAppLink" }, usesInheritance: true, usesOnChanges: true, ngImport: i0 });
|
|
30
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkDirective, decorators: [{
|
|
31
31
|
type: Directive,
|
|
32
32
|
args: [{
|
|
33
|
-
selector: '[skyAppLink]'
|
|
33
|
+
selector: '[skyAppLink]',
|
|
34
34
|
}]
|
|
35
35
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i1.ActivatedRoute }, { type: i2.LocationStrategy }, { type: i3.SkyAppConfig, decorators: [{
|
|
36
36
|
type: Optional
|
|
@@ -39,4 +39,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImpor
|
|
|
39
39
|
}] }]; }, propDecorators: { skyAppLink: [{
|
|
40
40
|
type: Input
|
|
41
41
|
}] } });
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
42
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGluay5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9yb3V0ZXIvc3JjL21vZHVsZXMvbGluay9saW5rLmRpcmVjdGl2ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsU0FBUyxFQUNULEtBQUssRUFFTCxRQUFRLEdBRVQsTUFBTSxlQUFlLENBQUM7QUFJdkIsT0FBTyxFQUEwQixrQkFBa0IsRUFBRSxNQUFNLGlCQUFpQixDQUFDOzs7OztBQVM3RSxNQUFNLE9BQU8sbUJBQ1gsU0FBUSxrQkFBa0I7SUFRMUIsWUFDRSxNQUFjLEVBQ2QsS0FBcUIsRUFDckIsZ0JBQWtDLEVBQ2QsWUFBMkIsRUFDM0IsY0FBa0Q7UUFFdEUsS0FBSyxDQUFDLE1BQU0sRUFBRSxLQUFLLEVBQUUsZ0JBQWdCLENBQUMsQ0FBQztRQUhuQixpQkFBWSxHQUFaLFlBQVksQ0FBZTtRQUMzQixtQkFBYyxHQUFkLGNBQWMsQ0FBb0M7SUFHeEUsQ0FBQztJQWJELElBQ0ksVUFBVSxDQUFDLFFBQXdCO1FBQ3JDLElBQUksQ0FBQyxVQUFVLEdBQUcsUUFBUSxDQUFDO0lBQzdCLENBQUM7SUFZTSxXQUFXLENBQUMsT0FBc0I7O1FBQ3ZDLElBQUksQ0FBQyxXQUFXLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQUEsT0FBTyxDQUFDLFdBQVcsMENBQUUsWUFBWSxDQUFDLENBQUM7UUFDNUUsS0FBSyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM3QixDQUFDO0lBRU8sZ0JBQWdCLENBQ3RCLFdBQWtDO1FBRWxDLE1BQU0sV0FBVyxHQUFHLElBQUksQ0FBQyxZQUFZO1lBQ25DLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQztZQUMvQyxDQUFDLENBQUMsSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBRTVDLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLFdBQVcsRUFBRSxXQUFXLEVBQUUsV0FBVyxDQUFDLENBQUM7SUFDdkUsQ0FBQzs7aUhBaENVLG1CQUFtQjtxR0FBbkIsbUJBQW1COzRGQUFuQixtQkFBbUI7a0JBSC9CLFNBQVM7bUJBQUM7b0JBQ1QsUUFBUSxFQUFFLGNBQWM7aUJBQ3pCOzswQkFjSSxRQUFROzswQkFDUixRQUFROzRDQVRQLFVBQVU7c0JBRGIsS0FBSyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIERpcmVjdGl2ZSxcbiAgSW5wdXQsXG4gIE9uQ2hhbmdlcyxcbiAgT3B0aW9uYWwsXG4gIFNpbXBsZUNoYW5nZXMsXG59IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5pbXBvcnQgeyBMb2NhdGlvblN0cmF0ZWd5IH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcblxuaW1wb3J0IHsgQWN0aXZhdGVkUm91dGUsIFJvdXRlciwgUm91dGVyTGlua1dpdGhIcmVmIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcblxuaW1wb3J0IHsgU2t5QXBwQ29uZmlnLCBTa3lBcHBSdW50aW1lQ29uZmlnUGFyYW1zUHJvdmlkZXIgfSBmcm9tICdAc2t5dXgvY29uZmlnJztcblxuaW1wb3J0IHsgU2t5QXBwTGlua1F1ZXJ5UGFyYW1zIH0gZnJvbSAnLi9saW5rLXF1ZXJ5LXBhcmFtcyc7XG5cbkBEaXJlY3RpdmUoe1xuICBzZWxlY3RvcjogJ1tza3lBcHBMaW5rXScsXG59KVxuZXhwb3J0IGNsYXNzIFNreUFwcExpbmtEaXJlY3RpdmVcbiAgZXh0ZW5kcyBSb3V0ZXJMaW5rV2l0aEhyZWZcbiAgaW1wbGVtZW50cyBPbkNoYW5nZXNcbntcbiAgQElucHV0KClcbiAgc2V0IHNreUFwcExpbmsoY29tbWFuZHM6IGFueVtdIHwgc3RyaW5nKSB7XG4gICAgdGhpcy5yb3V0ZXJMaW5rID0gY29tbWFuZHM7XG4gIH1cblxuICBjb25zdHJ1Y3RvcihcbiAgICByb3V0ZXI6IFJvdXRlcixcbiAgICByb3V0ZTogQWN0aXZhdGVkUm91dGUsXG4gICAgbG9jYXRpb25TdHJhdGVneTogTG9jYXRpb25TdHJhdGVneSxcbiAgICBAT3B0aW9uYWwoKSBwcml2YXRlIHNreUFwcENvbmZpZz86IFNreUFwcENvbmZpZyxcbiAgICBAT3B0aW9uYWwoKSBwcml2YXRlIHBhcmFtc1Byb3ZpZGVyPzogU2t5QXBwUnVudGltZUNvbmZpZ1BhcmFtc1Byb3ZpZGVyXG4gICkge1xuICAgIHN1cGVyKHJvdXRlciwgcm91dGUsIGxvY2F0aW9uU3RyYXRlZ3kpO1xuICB9XG5cbiAgcHVibGljIG5nT25DaGFuZ2VzKGNoYW5nZXM6IFNpbXBsZUNoYW5nZXMpOiB2b2lkIHtcbiAgICB0aGlzLnF1ZXJ5UGFyYW1zID0gdGhpcy5tZXJnZVF1ZXJ5UGFyYW1zKGNoYW5nZXMucXVlcnlQYXJhbXM/LmN1cnJlbnRWYWx1ZSk7XG4gICAgc3VwZXIubmdPbkNoYW5nZXMoY2hhbmdlcyk7XG4gIH1cblxuICBwcml2YXRlIG1lcmdlUXVlcnlQYXJhbXMoXG4gICAgcXVlcnlQYXJhbXM6IFNreUFwcExpbmtRdWVyeVBhcmFtc1xuICApOiBTa3lBcHBMaW5rUXVlcnlQYXJhbXMge1xuICAgIGNvbnN0IHNreXV4UGFyYW1zID0gdGhpcy5za3lBcHBDb25maWdcbiAgICAgID8gdGhpcy5za3lBcHBDb25maWcucnVudGltZS5wYXJhbXMuZ2V0QWxsKHRydWUpXG4gICAgICA6IHRoaXMucGFyYW1zUHJvdmlkZXIucGFyYW1zLmdldEFsbCh0cnVlKTtcblxuICAgIHJldHVybiBPYmplY3QuYXNzaWduKHt9LCB0aGlzLnF1ZXJ5UGFyYW1zLCBxdWVyeVBhcmFtcywgc2t5dXhQYXJhbXMpO1xuICB9XG59XG4iXX0=
|
|
@@ -5,22 +5,14 @@ import * as i0 from "@angular/core";
|
|
|
5
5
|
/* istanbul ignore next */
|
|
6
6
|
export class SkyAppLinkModule {
|
|
7
7
|
}
|
|
8
|
-
SkyAppLinkModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
9
|
-
SkyAppLinkModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
SkyAppLinkModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.8", ngImport: i0, type: SkyAppLinkModule });
|
|
13
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImport: i0, type: SkyAppLinkModule, decorators: [{
|
|
8
|
+
SkyAppLinkModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
9
|
+
SkyAppLinkModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule, declarations: [SkyAppLinkDirective, SkyAppLinkExternalDirective], exports: [SkyAppLinkDirective, SkyAppLinkExternalDirective] });
|
|
10
|
+
SkyAppLinkModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule });
|
|
11
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule, decorators: [{
|
|
14
12
|
type: NgModule,
|
|
15
13
|
args: [{
|
|
16
|
-
declarations: [
|
|
17
|
-
|
|
18
|
-
SkyAppLinkExternalDirective
|
|
19
|
-
],
|
|
20
|
-
exports: [
|
|
21
|
-
SkyAppLinkDirective,
|
|
22
|
-
SkyAppLinkExternalDirective
|
|
23
|
-
]
|
|
14
|
+
declarations: [SkyAppLinkDirective, SkyAppLinkExternalDirective],
|
|
15
|
+
exports: [SkyAppLinkDirective, SkyAppLinkExternalDirective],
|
|
24
16
|
}]
|
|
25
17
|
}] });
|
|
26
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
18
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGluay5tb2R1bGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9yb3V0ZXIvc3JjL21vZHVsZXMvbGluay9saW5rLm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRXpDLE9BQU8sRUFBRSxtQkFBbUIsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRXZELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDJCQUEyQixDQUFDOztBQU14RSwwQkFBMEI7QUFDMUIsTUFBTSxPQUFPLGdCQUFnQjs7OEdBQWhCLGdCQUFnQjsrR0FBaEIsZ0JBQWdCLGlCQUpaLG1CQUFtQixFQUFFLDJCQUEyQixhQUNyRCxtQkFBbUIsRUFBRSwyQkFBMkI7K0dBRy9DLGdCQUFnQjs0RkFBaEIsZ0JBQWdCO2tCQUw1QixRQUFRO21CQUFDO29CQUNSLFlBQVksRUFBRSxDQUFDLG1CQUFtQixFQUFFLDJCQUEyQixDQUFDO29CQUNoRSxPQUFPLEVBQUUsQ0FBQyxtQkFBbUIsRUFBRSwyQkFBMkIsQ0FBQztpQkFDNUQiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBOZ01vZHVsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG5pbXBvcnQgeyBTa3lBcHBMaW5rRGlyZWN0aXZlIH0gZnJvbSAnLi9saW5rLmRpcmVjdGl2ZSc7XG5cbmltcG9ydCB7IFNreUFwcExpbmtFeHRlcm5hbERpcmVjdGl2ZSB9IGZyb20gJy4vbGluay1leHRlcm5hbC5kaXJlY3RpdmUnO1xuXG5ATmdNb2R1bGUoe1xuICBkZWNsYXJhdGlvbnM6IFtTa3lBcHBMaW5rRGlyZWN0aXZlLCBTa3lBcHBMaW5rRXh0ZXJuYWxEaXJlY3RpdmVdLFxuICBleHBvcnRzOiBbU2t5QXBwTGlua0RpcmVjdGl2ZSwgU2t5QXBwTGlua0V4dGVybmFsRGlyZWN0aXZlXSxcbn0pXG4vKiBpc3RhbmJ1bCBpZ25vcmUgbmV4dCAqL1xuZXhwb3J0IGNsYXNzIFNreUFwcExpbmtNb2R1bGUge31cbiJdfQ==
|
package/fesm2015/skyux-router.js
CHANGED
|
@@ -23,18 +23,18 @@ class SkyAppLinkDirective extends RouterLinkWithHref {
|
|
|
23
23
|
super.ngOnChanges(changes);
|
|
24
24
|
}
|
|
25
25
|
mergeQueryParams(queryParams) {
|
|
26
|
-
const skyuxParams =
|
|
26
|
+
const skyuxParams = this.skyAppConfig
|
|
27
27
|
? this.skyAppConfig.runtime.params.getAll(true)
|
|
28
28
|
: this.paramsProvider.params.getAll(true);
|
|
29
29
|
return Object.assign({}, this.queryParams, queryParams, skyuxParams);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
|
-
SkyAppLinkDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
33
|
-
SkyAppLinkDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.
|
|
34
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
32
|
+
SkyAppLinkDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkDirective, deps: [{ token: i1.Router }, { token: i1.ActivatedRoute }, { token: i2.LocationStrategy }, { token: i4.SkyAppConfig, optional: true }, { token: i4.SkyAppRuntimeConfigParamsProvider, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
33
|
+
SkyAppLinkDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.13", type: SkyAppLinkDirective, selector: "[skyAppLink]", inputs: { skyAppLink: "skyAppLink" }, usesInheritance: true, usesOnChanges: true, ngImport: i0 });
|
|
34
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkDirective, decorators: [{
|
|
35
35
|
type: Directive,
|
|
36
36
|
args: [{
|
|
37
|
-
selector: '[skyAppLink]'
|
|
37
|
+
selector: '[skyAppLink]',
|
|
38
38
|
}]
|
|
39
39
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i1.ActivatedRoute }, { type: i2.LocationStrategy }, { type: i4.SkyAppConfig, decorators: [{
|
|
40
40
|
type: Optional
|
|
@@ -49,13 +49,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImpor
|
|
|
49
49
|
*/
|
|
50
50
|
class SkyAppLinkExternalDirective extends RouterLinkWithHref {
|
|
51
51
|
constructor(router, route, platformLocation, window, skyAppConfig, paramsProvider, hostConfig) {
|
|
52
|
-
super(router, route, new PathLocationStrategy(platformLocation,
|
|
53
|
-
? hostConfig.host.url
|
|
54
|
-
: skyAppConfig.skyux.host.url));
|
|
52
|
+
super(router, route, new PathLocationStrategy(platformLocation, hostConfig ? hostConfig.host.url : skyAppConfig.skyux.host.url));
|
|
55
53
|
this.window = window;
|
|
56
54
|
this.skyAppConfig = skyAppConfig;
|
|
57
55
|
this.paramsProvider = paramsProvider;
|
|
58
|
-
if (this.window.nativeWindow.window.name &&
|
|
56
|
+
if (this.window.nativeWindow.window.name &&
|
|
57
|
+
this.window.nativeWindow.window.name !== '') {
|
|
59
58
|
this.target = this.window.nativeWindow.window.name;
|
|
60
59
|
}
|
|
61
60
|
else {
|
|
@@ -71,18 +70,18 @@ class SkyAppLinkExternalDirective extends RouterLinkWithHref {
|
|
|
71
70
|
super.ngOnChanges(changes);
|
|
72
71
|
}
|
|
73
72
|
mergeQueryParams(queryParams) {
|
|
74
|
-
const skyuxParams =
|
|
73
|
+
const skyuxParams = this.skyAppConfig
|
|
75
74
|
? this.skyAppConfig.runtime.params.getAll()
|
|
76
75
|
: this.paramsProvider.params.getAll();
|
|
77
76
|
return Object.assign({}, this.queryParams, queryParams, skyuxParams);
|
|
78
77
|
}
|
|
79
78
|
}
|
|
80
|
-
SkyAppLinkExternalDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
81
|
-
SkyAppLinkExternalDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.
|
|
82
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
79
|
+
SkyAppLinkExternalDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkExternalDirective, deps: [{ token: i1.Router }, { token: i1.ActivatedRoute }, { token: i2.PlatformLocation }, { token: i3.SkyAppWindowRef }, { token: i4.SkyAppConfig, optional: true }, { token: i4.SkyAppRuntimeConfigParamsProvider, optional: true }, { token: i4.SkyAppConfigHost, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
80
|
+
SkyAppLinkExternalDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.13", type: SkyAppLinkExternalDirective, selector: "[skyAppLinkExternal]", inputs: { skyAppLinkExternal: "skyAppLinkExternal" }, usesInheritance: true, usesOnChanges: true, ngImport: i0 });
|
|
81
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkExternalDirective, decorators: [{
|
|
83
82
|
type: Directive,
|
|
84
83
|
args: [{
|
|
85
|
-
selector: '[skyAppLinkExternal]'
|
|
84
|
+
selector: '[skyAppLinkExternal]',
|
|
86
85
|
}]
|
|
87
86
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i1.ActivatedRoute }, { type: i2.PlatformLocation }, { type: i3.SkyAppWindowRef }, { type: i4.SkyAppConfig, decorators: [{
|
|
88
87
|
type: Optional
|
|
@@ -97,22 +96,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImpor
|
|
|
97
96
|
/* istanbul ignore next */
|
|
98
97
|
class SkyAppLinkModule {
|
|
99
98
|
}
|
|
100
|
-
SkyAppLinkModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
101
|
-
SkyAppLinkModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
SkyAppLinkModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.8", ngImport: i0, type: SkyAppLinkModule });
|
|
105
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImport: i0, type: SkyAppLinkModule, decorators: [{
|
|
99
|
+
SkyAppLinkModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
100
|
+
SkyAppLinkModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule, declarations: [SkyAppLinkDirective, SkyAppLinkExternalDirective], exports: [SkyAppLinkDirective, SkyAppLinkExternalDirective] });
|
|
101
|
+
SkyAppLinkModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule });
|
|
102
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyAppLinkModule, decorators: [{
|
|
106
103
|
type: NgModule,
|
|
107
104
|
args: [{
|
|
108
|
-
declarations: [
|
|
109
|
-
|
|
110
|
-
SkyAppLinkExternalDirective
|
|
111
|
-
],
|
|
112
|
-
exports: [
|
|
113
|
-
SkyAppLinkDirective,
|
|
114
|
-
SkyAppLinkExternalDirective
|
|
115
|
-
]
|
|
105
|
+
declarations: [SkyAppLinkDirective, SkyAppLinkExternalDirective],
|
|
106
|
+
exports: [SkyAppLinkDirective, SkyAppLinkExternalDirective],
|
|
116
107
|
}]
|
|
117
108
|
}] });
|
|
118
109
|
|
|
@@ -123,13 +114,13 @@ class SkyHrefResolverService {
|
|
|
123
114
|
resolveHref(args) {
|
|
124
115
|
return Promise.resolve({
|
|
125
116
|
url: args.url,
|
|
126
|
-
userHasAccess: true
|
|
117
|
+
userHasAccess: true,
|
|
127
118
|
});
|
|
128
119
|
}
|
|
129
120
|
}
|
|
130
|
-
SkyHrefResolverService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
131
|
-
SkyHrefResolverService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.
|
|
132
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
121
|
+
SkyHrefResolverService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefResolverService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
122
|
+
SkyHrefResolverService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefResolverService });
|
|
123
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefResolverService, decorators: [{
|
|
133
124
|
type: Injectable
|
|
134
125
|
}] });
|
|
135
126
|
|
|
@@ -201,15 +192,13 @@ class SkyHrefDirective {
|
|
|
201
192
|
checkRouteAccess() {
|
|
202
193
|
this._route = {
|
|
203
194
|
url: this._skyHref,
|
|
204
|
-
userHasAccess: false
|
|
195
|
+
userHasAccess: false,
|
|
205
196
|
};
|
|
206
197
|
/* istanbul ignore else */
|
|
207
198
|
if (this.hrefResolver && this._skyHref) {
|
|
208
199
|
this.applyChanges(this.getChanges());
|
|
209
200
|
try {
|
|
210
|
-
this.hrefResolver
|
|
211
|
-
.resolveHref({ url: this._skyHref })
|
|
212
|
-
.then((route) => {
|
|
201
|
+
this.hrefResolver.resolveHref({ url: this._skyHref }).then((route) => {
|
|
213
202
|
this._route = Object.assign({}, route);
|
|
214
203
|
this.applyChanges(this.getChanges());
|
|
215
204
|
});
|
|
@@ -229,7 +218,7 @@ class SkyHrefDirective {
|
|
|
229
218
|
if (!this._route || !this._route.userHasAccess) {
|
|
230
219
|
return {
|
|
231
220
|
href: '',
|
|
232
|
-
hidden: this._skyHrefElse === 'hide'
|
|
221
|
+
hidden: this._skyHrefElse === 'hide',
|
|
233
222
|
};
|
|
234
223
|
}
|
|
235
224
|
else {
|
|
@@ -242,14 +231,17 @@ class SkyHrefDirective {
|
|
|
242
231
|
});
|
|
243
232
|
}
|
|
244
233
|
const queryParamsMerged = new HttpParams({
|
|
245
|
-
fromObject: Object.assign({}, this.getSkyuxParams(), queryParams)
|
|
234
|
+
fromObject: Object.assign({}, this.getSkyuxParams(), queryParams),
|
|
246
235
|
});
|
|
247
|
-
this._href =
|
|
248
|
-
|
|
249
|
-
|
|
236
|
+
this._href =
|
|
237
|
+
baseUrl +
|
|
238
|
+
(queryParamsMerged.keys().length > 0
|
|
239
|
+
? '?' + queryParamsMerged.toString()
|
|
240
|
+
: '') +
|
|
241
|
+
(fragment ? `#${fragment}` : '');
|
|
250
242
|
return {
|
|
251
243
|
href: this._href,
|
|
252
|
-
hidden: false
|
|
244
|
+
hidden: false,
|
|
253
245
|
};
|
|
254
246
|
}
|
|
255
247
|
}
|
|
@@ -263,7 +255,9 @@ class SkyHrefDirective {
|
|
|
263
255
|
getUrlTree() {
|
|
264
256
|
var _a, _b, _c, _d, _e;
|
|
265
257
|
const href = this._href.toLowerCase();
|
|
266
|
-
if (!href ||
|
|
258
|
+
if (!href ||
|
|
259
|
+
!((_b = (_a = this.skyAppConfig) === null || _a === void 0 ? void 0 : _a.skyux.host) === null || _b === void 0 ? void 0 : _b.url) ||
|
|
260
|
+
!((_e = (_d = (_c = this.skyAppConfig) === null || _c === void 0 ? void 0 : _c.runtime) === null || _d === void 0 ? void 0 : _d.app) === null || _e === void 0 ? void 0 : _e.base)) {
|
|
267
261
|
return false;
|
|
268
262
|
}
|
|
269
263
|
const baseUrl = (this.skyAppConfig.skyux.host.url +
|
|
@@ -279,12 +273,12 @@ class SkyHrefDirective {
|
|
|
279
273
|
return false;
|
|
280
274
|
}
|
|
281
275
|
}
|
|
282
|
-
SkyHrefDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
283
|
-
SkyHrefDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.
|
|
284
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
276
|
+
SkyHrefDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefDirective, deps: [{ token: i1.Router }, { token: i0.Renderer2 }, { token: i0.ElementRef }, { token: i4.SkyAppConfig, optional: true }, { token: i4.SkyAppRuntimeConfigParamsProvider, optional: true }, { token: SkyHrefResolverService, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
|
|
277
|
+
SkyHrefDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "12.2.13", type: SkyHrefDirective, selector: "[skyHref]", inputs: { skyHref: "skyHref", skyHrefElse: "skyHrefElse" }, host: { listeners: { "click": "onClick($event.button,$event.ctrlKey,$event.shiftKey,$event.altKey,$event.metaKey)" } }, ngImport: i0 });
|
|
278
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefDirective, decorators: [{
|
|
285
279
|
type: Directive,
|
|
286
280
|
args: [{
|
|
287
|
-
selector: '[skyHref]'
|
|
281
|
+
selector: '[skyHref]',
|
|
288
282
|
}]
|
|
289
283
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: i0.Renderer2 }, { type: i0.ElementRef }, { type: i4.SkyAppConfig, decorators: [{
|
|
290
284
|
type: Optional
|
|
@@ -298,21 +292,26 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.8", ngImpor
|
|
|
298
292
|
type: Input
|
|
299
293
|
}], onClick: [{
|
|
300
294
|
type: HostListener,
|
|
301
|
-
args: ['click',
|
|
302
|
-
|
|
295
|
+
args: ['click', [
|
|
296
|
+
'$event.button',
|
|
297
|
+
'$event.ctrlKey',
|
|
298
|
+
'$event.shiftKey',
|
|
299
|
+
'$event.altKey',
|
|
300
|
+
'$event.metaKey',
|
|
301
|
+
]]
|
|
303
302
|
}] } });
|
|
304
303
|
|
|
305
304
|
class SkyHrefModule {
|
|
306
305
|
}
|
|
307
|
-
SkyHrefModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.
|
|
308
|
-
SkyHrefModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.
|
|
309
|
-
SkyHrefModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.
|
|
310
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.
|
|
306
|
+
SkyHrefModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
307
|
+
SkyHrefModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, declarations: [SkyHrefDirective], imports: [CommonModule], exports: [SkyHrefDirective] });
|
|
308
|
+
SkyHrefModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, imports: [[CommonModule]] });
|
|
309
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.13", ngImport: i0, type: SkyHrefModule, decorators: [{
|
|
311
310
|
type: NgModule,
|
|
312
311
|
args: [{
|
|
313
312
|
declarations: [SkyHrefDirective],
|
|
314
313
|
exports: [SkyHrefDirective],
|
|
315
|
-
imports: [CommonModule]
|
|
314
|
+
imports: [CommonModule],
|
|
316
315
|
}]
|
|
317
316
|
}] });
|
|
318
317
|
|