@wizishop/angular-components 14.4.56 → 14.4.58
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 +9 -5
- package/fesm2015/wizishop-angular-components.mjs +8 -4
- package/fesm2015/wizishop-angular-components.mjs.map +1 -1
- package/fesm2020/wizishop-angular-components.mjs +8 -4
- package/fesm2020/wizishop-angular-components.mjs.map +1 -1
- package/package.json +1 -1
- package/wizishop-angular-components-14.4.58.tgz +0 -0
- package/wizishop-angular-components-14.4.56.tgz +0 -0
|
@@ -10,16 +10,20 @@ export class HistoryService {
|
|
|
10
10
|
registerHistory() {
|
|
11
11
|
this.router.events.subscribe((event) => {
|
|
12
12
|
if (event instanceof NavigationEnd) {
|
|
13
|
-
this.history.
|
|
13
|
+
if (this.history.length > 0 && this.history[this.history.length - 1] === event.urlAfterRedirects.split('?')[0]) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
16
|
+
this.history.push(event.urlAfterRedirects.split('?')[0]);
|
|
14
17
|
console.log('history', this.history);
|
|
15
18
|
}
|
|
16
19
|
});
|
|
17
20
|
}
|
|
18
21
|
back(link) {
|
|
19
|
-
const lastlink = this.history[this.history.length - 1];
|
|
20
22
|
this.history.pop();
|
|
21
|
-
if (this.history.length > 0
|
|
22
|
-
this.
|
|
23
|
+
if (this.history.length > 0) {
|
|
24
|
+
const lastlink = this.history[this.history.length - 1];
|
|
25
|
+
console.log('lastlink', lastlink);
|
|
26
|
+
this.router.navigate(lastlink.split('/'));
|
|
23
27
|
}
|
|
24
28
|
else {
|
|
25
29
|
this.redirect(link);
|
|
@@ -48,4 +52,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.7", ngImpor
|
|
|
48
52
|
providedIn: 'root'
|
|
49
53
|
}]
|
|
50
54
|
}], ctorParameters: function () { return [{ type: i1.Router }]; } });
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlzdG9yeS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1jb21wb25lbnRzL3NyYy9saWIvc2VydmljZXMvaGlzdG9yeS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLGFBQWEsRUFBVSxNQUFNLGlCQUFpQixDQUFDOzs7QUFNeEQsTUFBTSxPQUFPLGNBQWM7SUFHekIsWUFBb0IsTUFBYztRQUFkLFdBQU0sR0FBTixNQUFNLENBQVE7UUFGMUIsWUFBTyxHQUFhLEVBQUUsQ0FBQztJQUVNLENBQUM7SUFFdEMsZUFBZTtRQUNiLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3JDLElBQUksS0FBSyxZQUFZLGFBQWEsRUFBRTtnQkFDbEMsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsS0FBSyxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO29CQUM5RyxPQUFPO2lCQUNSO2dCQUNELElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtnQkFDeEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2FBQ3RDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsSUFBSSxDQUFDLElBQWM7UUFDakIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUNuQixJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRTtZQUMzQixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ3ZELE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFDO1lBQ2xDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztTQUMzQzthQUFNO1lBQ0wsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUNyQjtJQUNILENBQUM7SUFFRCxRQUFRLENBQUMsSUFBYztRQUNyQixJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7WUFDbEMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ25DO2FBQU07WUFDTCxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDbkM7SUFDSCxDQUFDO0lBRUQsc0JBQXNCLENBQUMsSUFBYztRQUNuQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakMsQ0FBQztJQUVELHNCQUFzQixDQUFDLElBQWM7UUFDbkMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDN0IsQ0FBQzs7MkdBMUNVLGNBQWM7K0dBQWQsY0FBYyxjQUZiLE1BQU07MkZBRVAsY0FBYztrQkFIMUIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgeyBOYXZpZ2F0aW9uRW5kLCBSb3V0ZXIgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgTG9jYXRpb24gfSBmcm9tICdAYW5ndWxhci9jb21tb24nO1xuXG5ASW5qZWN0YWJsZSh7XG4gIHByb3ZpZGVkSW46ICdyb290J1xufSlcbmV4cG9ydCBjbGFzcyBIaXN0b3J5U2VydmljZSB7XG4gIHByaXZhdGUgaGlzdG9yeTogc3RyaW5nW10gPSBbXTtcblxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIHJvdXRlcjogUm91dGVyKSB7fVxuXG4gIHJlZ2lzdGVySGlzdG9yeSgpIHtcbiAgICB0aGlzLnJvdXRlci5ldmVudHMuc3Vic2NyaWJlKChldmVudCkgPT4ge1xuICAgICAgaWYgKGV2ZW50IGluc3RhbmNlb2YgTmF2aWdhdGlvbkVuZCkge1xuICAgICAgICBpZiAodGhpcy5oaXN0b3J5Lmxlbmd0aCA+IDAgJiYgdGhpcy5oaXN0b3J5W3RoaXMuaGlzdG9yeS5sZW5ndGggLSAxXSA9PT0gZXZlbnQudXJsQWZ0ZXJSZWRpcmVjdHMuc3BsaXQoJz8nKVswXSkge1xuICAgICAgICAgIHJldHVybjtcbiAgICAgICAgfVxuICAgICAgICB0aGlzLmhpc3RvcnkucHVzaChldmVudC51cmxBZnRlclJlZGlyZWN0cy5zcGxpdCgnPycpWzBdKVxuICAgICAgICBjb25zb2xlLmxvZygnaGlzdG9yeScsIHRoaXMuaGlzdG9yeSk7XG4gICAgICB9XG4gICAgfSlcbiAgfVxuXG4gIGJhY2sobGluazogc3RyaW5nW10pIHtcbiAgICB0aGlzLmhpc3RvcnkucG9wKCk7XG4gICAgaWYgKHRoaXMuaGlzdG9yeS5sZW5ndGggPiAwKSB7XG4gICAgICBjb25zdCBsYXN0bGluayA9IHRoaXMuaGlzdG9yeVt0aGlzLmhpc3RvcnkubGVuZ3RoIC0gMV07XG4gICAgICBjb25zb2xlLmxvZygnbGFzdGxpbmsnLCBsYXN0bGluayk7XG4gICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShsYXN0bGluay5zcGxpdCgnLycpKTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy5yZWRpcmVjdChsaW5rKTtcbiAgICB9XG4gIH1cblxuICByZWRpcmVjdChsaW5rOiBzdHJpbmdbXSkge1xuICAgIGlmIChsaW5rWzBdLmluZGV4T2YoJ2h0dHAnKSAhPT0gLTEpIHtcbiAgICAgIHRoaXMucmVkaXJlY3RUb0V4dGVybmFsTGluayhsaW5rKTtcbiAgICB9IGVsc2Uge1xuICAgICAgdGhpcy5yZWRpcmVjdFRvSW50ZXJuYWxMaW5rKGxpbmspO1xuICAgIH1cbiAgfVxuXG4gIHJlZGlyZWN0VG9FeHRlcm5hbExpbmsobGluazogc3RyaW5nW10pIHtcbiAgICB3aW5kb3cubG9jYXRpb24uaHJlZiA9IGxpbmtbMF07XG4gIH1cblxuICByZWRpcmVjdFRvSW50ZXJuYWxMaW5rKGxpbms6IHN0cmluZ1tdKSB7XG4gICAgdGhpcy5yb3V0ZXIubmF2aWdhdGUobGluayk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -2585,16 +2585,20 @@ class HistoryService {
|
|
|
2585
2585
|
registerHistory() {
|
|
2586
2586
|
this.router.events.subscribe((event) => {
|
|
2587
2587
|
if (event instanceof NavigationEnd) {
|
|
2588
|
-
this.history.
|
|
2588
|
+
if (this.history.length > 0 && this.history[this.history.length - 1] === event.urlAfterRedirects.split('?')[0]) {
|
|
2589
|
+
return;
|
|
2590
|
+
}
|
|
2591
|
+
this.history.push(event.urlAfterRedirects.split('?')[0]);
|
|
2589
2592
|
console.log('history', this.history);
|
|
2590
2593
|
}
|
|
2591
2594
|
});
|
|
2592
2595
|
}
|
|
2593
2596
|
back(link) {
|
|
2594
|
-
const lastlink = this.history[this.history.length - 1];
|
|
2595
2597
|
this.history.pop();
|
|
2596
|
-
if (this.history.length > 0
|
|
2597
|
-
this.
|
|
2598
|
+
if (this.history.length > 0) {
|
|
2599
|
+
const lastlink = this.history[this.history.length - 1];
|
|
2600
|
+
console.log('lastlink', lastlink);
|
|
2601
|
+
this.router.navigate(lastlink.split('/'));
|
|
2598
2602
|
}
|
|
2599
2603
|
else {
|
|
2600
2604
|
this.redirect(link);
|