@wizishop/angular-components 14.4.55 → 14.4.56
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/esm2020/lib/services/history.service.mjs +7 -8
- package/fesm2015/wizishop-angular-components.mjs +6 -6
- package/fesm2015/wizishop-angular-components.mjs.map +1 -1
- package/fesm2020/wizishop-angular-components.mjs +6 -6
- package/fesm2020/wizishop-angular-components.mjs.map +1 -1
- package/lib/services/history.service.d.ts +1 -3
- package/package.json +1 -1
- package/wizishop-angular-components-14.4.56.tgz +0 -0
- package/wizishop-angular-components-14.4.55.tgz +0 -0
|
@@ -2,11 +2,9 @@ import { Injectable } from '@angular/core';
|
|
|
2
2
|
import { NavigationEnd } from '@angular/router';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
import * as i1 from "@angular/router";
|
|
5
|
-
import * as i2 from "@angular/common";
|
|
6
5
|
export class HistoryService {
|
|
7
|
-
constructor(router
|
|
6
|
+
constructor(router) {
|
|
8
7
|
this.router = router;
|
|
9
|
-
this.location = location;
|
|
10
8
|
this.history = [];
|
|
11
9
|
}
|
|
12
10
|
registerHistory() {
|
|
@@ -18,9 +16,10 @@ export class HistoryService {
|
|
|
18
16
|
});
|
|
19
17
|
}
|
|
20
18
|
back(link) {
|
|
19
|
+
const lastlink = this.history[this.history.length - 1];
|
|
21
20
|
this.history.pop();
|
|
22
|
-
if (this.history.length > 0) {
|
|
23
|
-
this.
|
|
21
|
+
if (this.history.length > 0 && lastlink) {
|
|
22
|
+
this.router.navigate([lastlink]);
|
|
24
23
|
}
|
|
25
24
|
else {
|
|
26
25
|
this.redirect(link);
|
|
@@ -41,12 +40,12 @@ export class HistoryService {
|
|
|
41
40
|
this.router.navigate(link);
|
|
42
41
|
}
|
|
43
42
|
}
|
|
44
|
-
HistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, deps: [{ token: i1.Router }
|
|
43
|
+
HistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, deps: [{ token: i1.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
45
44
|
HistoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, providedIn: 'root' });
|
|
46
45
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, decorators: [{
|
|
47
46
|
type: Injectable,
|
|
48
47
|
args: [{
|
|
49
48
|
providedIn: 'root'
|
|
50
49
|
}]
|
|
51
|
-
}], ctorParameters: function () { return [{ type: i1.Router }
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
}], ctorParameters: function () { return [{ type: i1.Router }]; } });
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlzdG9yeS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1jb21wb25lbnRzL3NyYy9saWIvc2VydmljZXMvaGlzdG9yeS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLGFBQWEsRUFBVSxNQUFNLGlCQUFpQixDQUFDOzs7QUFNeEQsTUFBTSxPQUFPLGNBQWM7SUFHekIsWUFBb0IsTUFBYztRQUFkLFdBQU0sR0FBTixNQUFNLENBQVE7UUFGMUIsWUFBTyxHQUFhLEVBQUUsQ0FBQztJQUVNLENBQUM7SUFFdEMsZUFBZTtRQUNiLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3JDLElBQUksS0FBSyxZQUFZLGFBQWEsRUFBRTtnQkFDbEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGlCQUFpQixDQUFDLENBQUE7Z0JBQzFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQzthQUN0QztRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUVELElBQUksQ0FBQyxJQUFjO1FBQ2pCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQTtRQUNsQixJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsSUFBSSxRQUFRLEVBQUU7WUFDdkMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1NBQ2xDO2FBQU07WUFDTCxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3JCO0lBQ0gsQ0FBQztJQUVELFFBQVEsQ0FBQyxJQUFjO1FBQ3JCLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtZQUNsQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbkM7YUFBTTtZQUNMLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUNuQztJQUNILENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxJQUFjO1FBQ25DLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBRUQsc0JBQXNCLENBQUMsSUFBYztRQUNuQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUM3QixDQUFDOzsyR0F0Q1UsY0FBYzsrR0FBZCxjQUFjLGNBRmIsTUFBTTsyRkFFUCxjQUFjO2tCQUgxQixVQUFVO21CQUFDO29CQUNWLFVBQVUsRUFBRSxNQUFNO2lCQUNuQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IE5hdmlnYXRpb25FbmQsIFJvdXRlciB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBMb2NhdGlvbiB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbic7XG5cbkBJbmplY3RhYmxlKHtcbiAgcHJvdmlkZWRJbjogJ3Jvb3QnXG59KVxuZXhwb3J0IGNsYXNzIEhpc3RvcnlTZXJ2aWNlIHtcbiAgcHJpdmF0ZSBoaXN0b3J5OiBzdHJpbmdbXSA9IFtdO1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcm91dGVyOiBSb3V0ZXIpIHt9XG5cbiAgcmVnaXN0ZXJIaXN0b3J5KCkge1xuICAgIHRoaXMucm91dGVyLmV2ZW50cy5zdWJzY3JpYmUoKGV2ZW50KSA9PiB7XG4gICAgICBpZiAoZXZlbnQgaW5zdGFuY2VvZiBOYXZpZ2F0aW9uRW5kKSB7XG4gICAgICAgIHRoaXMuaGlzdG9yeS5wdXNoKGV2ZW50LnVybEFmdGVyUmVkaXJlY3RzKVxuICAgICAgICBjb25zb2xlLmxvZygnaGlzdG9yeScsIHRoaXMuaGlzdG9yeSk7XG4gICAgICB9XG4gICAgfSlcbiAgfVxuXG4gIGJhY2sobGluazogc3RyaW5nW10pIHtcbiAgICBjb25zdCBsYXN0bGluayA9IHRoaXMuaGlzdG9yeVt0aGlzLmhpc3RvcnkubGVuZ3RoIC0gMV07XG4gICAgdGhpcy5oaXN0b3J5LnBvcCgpXG4gICAgaWYgKHRoaXMuaGlzdG9yeS5sZW5ndGggPiAwICYmIGxhc3RsaW5rKSB7XG4gICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbbGFzdGxpbmtdKTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy5yZWRpcmVjdChsaW5rKTtcbiAgICB9XG4gIH1cblxuICByZWRpcmVjdChsaW5rOiBzdHJpbmdbXSkge1xuICAgIGlmIChsaW5rWzBdLmluZGV4T2YoJ2h0dHAnKSAhPT0gLTEpIHtcbiAgICAgIHRoaXMucmVkaXJlY3RUb0V4dGVybmFsTGluayhsaW5rKTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy5yZWRpcmVjdFRvSW50ZXJuYWxMaW5rKGxpbmspO1xuICAgIH1cbiAgfVxuXG4gIHJlZGlyZWN0VG9FeHRlcm5hbExpbmsobGluazogc3RyaW5nW10pIHtcbiAgICB3aW5kb3cubG9jYXRpb24uaHJlZiA9IGxpbmtbMF07XG4gIH1cblxuICByZWRpcmVjdFRvSW50ZXJuYWxMaW5rKGxpbms6IHN0cmluZ1tdKSB7XG4gICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUobGluayk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -2578,9 +2578,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.7", ngImpor
|
|
|
2578
2578
|
}] } });
|
|
2579
2579
|
|
|
2580
2580
|
class HistoryService {
|
|
2581
|
-
constructor(router
|
|
2581
|
+
constructor(router) {
|
|
2582
2582
|
this.router = router;
|
|
2583
|
-
this.location = location;
|
|
2584
2583
|
this.history = [];
|
|
2585
2584
|
}
|
|
2586
2585
|
registerHistory() {
|
|
@@ -2592,9 +2591,10 @@ class HistoryService {
|
|
|
2592
2591
|
});
|
|
2593
2592
|
}
|
|
2594
2593
|
back(link) {
|
|
2594
|
+
const lastlink = this.history[this.history.length - 1];
|
|
2595
2595
|
this.history.pop();
|
|
2596
|
-
if (this.history.length > 0) {
|
|
2597
|
-
this.
|
|
2596
|
+
if (this.history.length > 0 && lastlink) {
|
|
2597
|
+
this.router.navigate([lastlink]);
|
|
2598
2598
|
}
|
|
2599
2599
|
else {
|
|
2600
2600
|
this.redirect(link);
|
|
@@ -2615,14 +2615,14 @@ class HistoryService {
|
|
|
2615
2615
|
this.router.navigate(link);
|
|
2616
2616
|
}
|
|
2617
2617
|
}
|
|
2618
|
-
HistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, deps: [{ token: i1$3.Router }
|
|
2618
|
+
HistoryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, deps: [{ token: i1$3.Router }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
2619
2619
|
HistoryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, providedIn: 'root' });
|
|
2620
2620
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.7", ngImport: i0, type: HistoryService, decorators: [{
|
|
2621
2621
|
type: Injectable,
|
|
2622
2622
|
args: [{
|
|
2623
2623
|
providedIn: 'root'
|
|
2624
2624
|
}]
|
|
2625
|
-
}], ctorParameters: function () { return [{ type: i1$3.Router }
|
|
2625
|
+
}], ctorParameters: function () { return [{ type: i1$3.Router }]; } });
|
|
2626
2626
|
|
|
2627
2627
|
class HeaderPageComponent {
|
|
2628
2628
|
constructor(historyService, location) {
|