@wizishop/angular-components 14.4.57 → 14.4.59
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 +10 -6
- package/fesm2015/wizishop-angular-components.mjs +9 -5
- package/fesm2015/wizishop-angular-components.mjs.map +1 -1
- package/fesm2020/wizishop-angular-components.mjs +9 -5
- package/fesm2020/wizishop-angular-components.mjs.map +1 -1
- package/package.json +1 -1
- package/wizishop-angular-components-14.4.59.tgz +0 -0
- package/wizishop-angular-components-14.4.57.tgz +0 -0
|
@@ -10,17 +10,21 @@ 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
|
-
|
|
20
|
-
console.log('back', lastlink);
|
|
22
|
+
console.log('back', this.history);
|
|
21
23
|
this.history.pop();
|
|
22
|
-
if (this.history.length > 0
|
|
23
|
-
this.
|
|
24
|
+
if (this.history.length > 0) {
|
|
25
|
+
const lastlink = this.history[this.history.length - 1];
|
|
26
|
+
console.log('lastlink', lastlink);
|
|
27
|
+
this.router.navigate(lastlink.split('/'));
|
|
24
28
|
}
|
|
25
29
|
else {
|
|
26
30
|
this.redirect(link);
|
|
@@ -49,4 +53,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.7", ngImpor
|
|
|
49
53
|
providedIn: 'root'
|
|
50
54
|
}]
|
|
51
55
|
}], ctorParameters: function () { return [{ type: i1.Router }]; } });
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlzdG9yeS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYW5ndWxhci1jb21wb25lbnRzL3NyYy9saWIvc2VydmljZXMvaGlzdG9yeS5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUFFLGFBQWEsRUFBVSxNQUFNLGlCQUFpQixDQUFDOzs7QUFNeEQsTUFBTSxPQUFPLGNBQWM7SUFHekIsWUFBb0IsTUFBYztRQUFkLFdBQU0sR0FBTixNQUFNLENBQVE7UUFGMUIsWUFBTyxHQUFhLEVBQUUsQ0FBQztJQUVNLENBQUM7SUFFdEMsZUFBZTtRQUNiLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEtBQUssRUFBRSxFQUFFO1lBQ3JDLElBQUksS0FBSyxZQUFZLGFBQWEsRUFBRTtnQkFDbEMsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsS0FBSyxLQUFLLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO29CQUM5RyxPQUFPO2lCQUNSO2dCQUNELElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtnQkFDeEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2FBQ3RDO1FBQ0gsQ0FBQyxDQUFDLENBQUE7SUFDSixDQUFDO0lBRUQsSUFBSSxDQUFDLElBQWM7UUFDakIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDbkIsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDM0IsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztZQUN2RCxPQUFPLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxRQUFRLENBQUMsQ0FBQztZQUNsQyxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7U0FDM0M7YUFBTTtZQUNMLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7U0FDckI7SUFDSCxDQUFDO0lBRUQsUUFBUSxDQUFDLElBQWM7UUFDckIsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFO1lBQ2xDLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUNuQzthQUFNO1lBQ0wsSUFBSSxDQUFDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ25DO0lBQ0gsQ0FBQztJQUVELHNCQUFzQixDQUFDLElBQWM7UUFDbkMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFFRCxzQkFBc0IsQ0FBQyxJQUFjO1FBQ25DLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzdCLENBQUM7OzJHQTNDVSxjQUFjOytHQUFkLGNBQWMsY0FGYixNQUFNOzJGQUVQLGNBQWM7a0JBSDFCLFVBQVU7bUJBQUM7b0JBQ1YsVUFBVSxFQUFFLE1BQU07aUJBQ25CIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTmF2aWdhdGlvbkVuZCwgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IExvY2F0aW9uIH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uJztcblxuQEluamVjdGFibGUoe1xuICBwcm92aWRlZEluOiAncm9vdCdcbn0pXG5leHBvcnQgY2xhc3MgSGlzdG9yeVNlcnZpY2Uge1xuICBwcml2YXRlIGhpc3Rvcnk6IHN0cmluZ1tdID0gW107XG5cbiAgY29uc3RydWN0b3IocHJpdmF0ZSByb3V0ZXI6IFJvdXRlcikge31cblxuICByZWdpc3Rlckhpc3RvcnkoKSB7XG4gICAgdGhpcy5yb3V0ZXIuZXZlbnRzLnN1YnNjcmliZSgoZXZlbnQpID0+IHtcbiAgICAgIGlmIChldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQpIHtcbiAgICAgICAgaWYgKHRoaXMuaGlzdG9yeS5sZW5ndGggPiAwICYmIHRoaXMuaGlzdG9yeVt0aGlzLmhpc3RvcnkubGVuZ3RoIC0gMV0gPT09IGV2ZW50LnVybEFmdGVyUmVkaXJlY3RzLnNwbGl0KCc/JylbMF0pIHtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cbiAgICAgICAgdGhpcy5oaXN0b3J5LnB1c2goZXZlbnQudXJsQWZ0ZXJSZWRpcmVjdHMuc3BsaXQoJz8nKVswXSlcbiAgICAgICAgY29uc29sZS5sb2coJ2hpc3RvcnknLCB0aGlzLmhpc3RvcnkpO1xuICAgICAgfVxuICAgIH0pXG4gIH1cblxuICBiYWNrKGxpbms6IHN0cmluZ1tdKSB7XG4gICAgY29uc29sZS5sb2coJ2JhY2snLCB0aGlzLmhpc3RvcnkpO1xuICAgIHRoaXMuaGlzdG9yeS5wb3AoKTtcbiAgICBpZiAodGhpcy5oaXN0b3J5Lmxlbmd0aCA+IDApIHtcbiAgICAgIGNvbnN0IGxhc3RsaW5rID0gdGhpcy5oaXN0b3J5W3RoaXMuaGlzdG9yeS5sZW5ndGggLSAxXTtcbiAgICAgIGNvbnNvbGUubG9nKCdsYXN0bGluaycsIGxhc3RsaW5rKTtcbiAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlKGxhc3RsaW5rLnNwbGl0KCcvJykpO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aGlzLnJlZGlyZWN0KGxpbmspO1xuICAgIH1cbiAgfVxuXG4gIHJlZGlyZWN0KGxpbms6IHN0cmluZ1tdKSB7XG4gICAgaWYgKGxpbmtbMF0uaW5kZXhPZignaHR0cCcpICE9PSAtMSkge1xuICAgICAgdGhpcy5yZWRpcmVjdFRvRXh0ZXJuYWxMaW5rKGxpbmspO1xuICAgIH0gZWxzZSB7XG4gICAgICB0aGlzLnJlZGlyZWN0VG9JbnRlcm5hbExpbmsobGluayk7XG4gICAgfVxuICB9XG5cbiAgcmVkaXJlY3RUb0V4dGVybmFsTGluayhsaW5rOiBzdHJpbmdbXSkge1xuICAgIHdpbmRvdy5sb2NhdGlvbi5ocmVmID0gbGlua1swXTtcbiAgfVxuXG4gIHJlZGlyZWN0VG9JbnRlcm5hbExpbmsobGluazogc3RyaW5nW10pIHtcbiAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShsaW5rKTtcbiAgfVxufVxuIl19
|
|
@@ -2585,17 +2585,21 @@ 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
|
-
|
|
2595
|
-
console.log('back', lastlink);
|
|
2597
|
+
console.log('back', this.history);
|
|
2596
2598
|
this.history.pop();
|
|
2597
|
-
if (this.history.length > 0
|
|
2598
|
-
this.
|
|
2599
|
+
if (this.history.length > 0) {
|
|
2600
|
+
const lastlink = this.history[this.history.length - 1];
|
|
2601
|
+
console.log('lastlink', lastlink);
|
|
2602
|
+
this.router.navigate(lastlink.split('/'));
|
|
2599
2603
|
}
|
|
2600
2604
|
else {
|
|
2601
2605
|
this.redirect(link);
|