bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00
Code Issues Releases Wiki Activity

use router.navigate rather than location

Browse Source
This commit is contained in:
Kyle Spearrin
2018-11-30 10:28:46 -05:00
parent 9a99a95b15
commit dd282383d7
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: 2a960da31c...5609fecbce

14
src/app/organizations/vault/vault.component.ts
View File

@@ -1,4 +1,3 @@
import { Location } from '@angular/common';
import { import {
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
@@ -56,11 +55,10 @@ export class VaultComponent implements OnInit, OnDestroy {
private modal: ModalComponent = null; private modal: ModalComponent = null;
constructor(private route: ActivatedRoute, private userService: UserService, constructor(private route: ActivatedRoute, private userService: UserService,
private location: Location, private router: Router, private router: Router, private changeDetectorRef: ChangeDetectorRef,
private syncService: SyncService, private i18nService: I18nService, private syncService: SyncService, private i18nService: I18nService,
private componentFactoryResolver: ComponentFactoryResolver, private messagingService: MessagingService, private componentFactoryResolver: ComponentFactoryResolver, private messagingService: MessagingService,
private broadcasterService: BroadcasterService, private ngZone: NgZone, private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
private changeDetectorRef: ChangeDetectorRef) { }
ngOnInit() { ngOnInit() {
this.route.parent.params.subscribe(async (params) => { this.route.parent.params.subscribe(async (params) => {
@@ -295,8 +293,10 @@ export class VaultComponent implements OnInit, OnDestroy {
}; };
} }
const url = this.router.createUrlTree(['organizations', this.organization.id, 'vault'], this.router.navigate([], {
{ queryParams: queryParams }).toString(); relativeTo: this.route,
this.location.go(url); queryParams: queryParams,
replaceUrl: true,
});
} }
} }

13
src/app/vault/vault.component.ts
View File

@@ -1,4 +1,3 @@
import { Location } from '@angular/common';
import { import {
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
@@ -77,13 +76,12 @@ export class VaultComponent implements OnInit, OnDestroy {
private modal: ModalComponent = null; private modal: ModalComponent = null;
constructor(private syncService: SyncService, private route: ActivatedRoute, constructor(private syncService: SyncService, private route: ActivatedRoute,
private router: Router, private location: Location, private router: Router, private changeDetectorRef: ChangeDetectorRef,
private i18nService: I18nService, private componentFactoryResolver: ComponentFactoryResolver, private i18nService: I18nService, private componentFactoryResolver: ComponentFactoryResolver,
private tokenService: TokenService, private cryptoService: CryptoService, private tokenService: TokenService, private cryptoService: CryptoService,
private messagingService: MessagingService, private userService: UserService, private messagingService: MessagingService, private userService: UserService,
private platformUtilsService: PlatformUtilsService, private toasterService: ToasterService, private platformUtilsService: PlatformUtilsService, private toasterService: ToasterService,
private broadcasterService: BroadcasterService, private ngZone: NgZone, private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
private changeDetectorRef: ChangeDetectorRef) { }
async ngOnInit() { async ngOnInit() {
this.showVerifyEmail = !(await this.tokenService.getEmailVerified()); this.showVerifyEmail = !(await this.tokenService.getEmailVerified());
@@ -480,7 +478,10 @@ export class VaultComponent implements OnInit, OnDestroy {
}; };
} }
const url = this.router.createUrlTree(['vault'], { queryParams: queryParams }).toString(); this.router.navigate([], {
this.location.go(url); relativeTo: this.route,
queryParams: queryParams,
replaceUrl: true,
});
} }
} }