From fd5d47da7c3efecd44c6fabf0f6c2d561a2941bb Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 20 Dec 2018 10:20:57 -0500 Subject: [PATCH] unsub from queryParams observable --- jslib | 2 +- src/popup/settings/folder-add-edit.component.ts | 3 ++- src/popup/vault/add-edit.component.ts | 3 ++- src/popup/vault/attachments.component.ts | 3 ++- src/popup/vault/ciphers.component.ts | 3 ++- src/popup/vault/collections.component.ts | 3 ++- src/popup/vault/groupings.component.ts | 3 ++- src/popup/vault/password-history.component.ts | 3 ++- src/popup/vault/share.component.ts | 3 ++- src/popup/vault/view.component.ts | 3 ++- 10 files changed, 19 insertions(+), 10 deletions(-) diff --git a/jslib b/jslib index aa178493294..cddeeefdbb1 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit aa1784932945bfd1115f366cf5dafc6b481c19a3 +Subproject commit cddeeefdbb14d5f70020fb705885eb05a0bb4339 diff --git a/src/popup/settings/folder-add-edit.component.ts b/src/popup/settings/folder-add-edit.component.ts index 0adf7237cc9..73d5509fc8f 100644 --- a/src/popup/settings/folder-add-edit.component.ts +++ b/src/popup/settings/folder-add-edit.component.ts @@ -24,11 +24,12 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent { } async ngOnInit() { - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { if (params.folderId) { this.folderId = params.folderId; } await super.ngOnInit(); + queryParamsSub.unsubscribe(); }); } diff --git a/src/popup/vault/add-edit.component.ts b/src/popup/vault/add-edit.component.ts index f32e1cde865..3e9a08415df 100644 --- a/src/popup/vault/add-edit.component.ts +++ b/src/popup/vault/add-edit.component.ts @@ -36,7 +36,7 @@ export class AddEditComponent extends BaseAddEditComponent { async ngOnInit() { await super.ngOnInit(); this.showAttachments = !this.platformUtilsService.isEdge(); - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { if (params.cipherId) { this.cipherId = params.cipherId; } @@ -65,6 +65,7 @@ export class AddEditComponent extends BaseAddEditComponent { this.cipher.login.uris[0].uri = params.uri; } } + queryParamsSub.unsubscribe(); }); window.setTimeout(() => { diff --git a/src/popup/vault/attachments.component.ts b/src/popup/vault/attachments.component.ts index 82bf5a85a5a..b78b84c56ea 100644 --- a/src/popup/vault/attachments.component.ts +++ b/src/popup/vault/attachments.component.ts @@ -23,9 +23,10 @@ export class AttachmentsComponent extends BaseAttachmentsComponent { } async ngOnInit() { - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { this.cipherId = params.cipherId; await super.ngOnInit(); + queryParamsSub.unsubscribe(); }); } diff --git a/src/popup/vault/ciphers.component.ts b/src/popup/vault/ciphers.component.ts index aa9768dd1c2..e270bc6356b 100644 --- a/src/popup/vault/ciphers.component.ts +++ b/src/popup/vault/ciphers.component.ts @@ -72,7 +72,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On } async ngOnInit() { - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { if (params.type) { this.searchPlaceholder = this.i18nService.t('searchType'); this.type = parseInt(params.type, null); @@ -131,6 +131,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0); } this.stateService.remove(ComponentId); + queryParamsSub.unsubscribe(); }); this.broadcasterService.subscribe(ComponentId, (message: any) => { diff --git a/src/popup/vault/collections.component.ts b/src/popup/vault/collections.component.ts index 6827c4ff83e..ab9764e75c5 100644 --- a/src/popup/vault/collections.component.ts +++ b/src/popup/vault/collections.component.ts @@ -24,9 +24,10 @@ export class CollectionsComponent extends BaseCollectionsComponent { this.onSavedCollections.subscribe(() => { this.back(); }); - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { this.cipherId = params.cipherId; await super.ngOnInit(); + queryParamsSub.unsubscribe(); }); } diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts index a634f98efe6..e27485f2afb 100644 --- a/src/popup/vault/groupings.component.ts +++ b/src/popup/vault/groupings.component.ts @@ -110,7 +110,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit }); const restoredScopeState = await this.restoreState(); - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { this.state = (await this.stateService.get(ComponentId)) || {}; if (this.state.searchText) { this.searchText = this.state.searchText; @@ -132,6 +132,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit if (!this.syncService.syncInProgress || restoredScopeState) { window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0); } + queryParamsSub.unsubscribe(); }); } diff --git a/src/popup/vault/password-history.component.ts b/src/popup/vault/password-history.component.ts index 21e00228f6b..4cbe056d588 100644 --- a/src/popup/vault/password-history.component.ts +++ b/src/popup/vault/password-history.component.ts @@ -22,7 +22,7 @@ export class PasswordHistoryComponent extends BasePasswordHistoryComponent { } async ngOnInit() { - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { if (params.cipherId) { this.cipherId = params.cipherId; } else { @@ -30,6 +30,7 @@ export class PasswordHistoryComponent extends BasePasswordHistoryComponent { } await super.ngOnInit(); + queryParamsSub.unsubscribe(); }); } diff --git a/src/popup/vault/share.component.ts b/src/popup/vault/share.component.ts index f425b0cf8ab..f50164587f2 100644 --- a/src/popup/vault/share.component.ts +++ b/src/popup/vault/share.component.ts @@ -29,9 +29,10 @@ export class ShareComponent extends BaseShareComponent { this.onSharedCipher.subscribe(() => { this.router.navigate(['view-cipher', { cipherId: this.cipherId }]); }); - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { this.cipherId = params.cipherId; await super.ngOnInit(); + queryParamsSub.unsubscribe(); }); } diff --git a/src/popup/vault/view.component.ts b/src/popup/vault/view.component.ts index 649eb778840..84c61ff2921 100644 --- a/src/popup/vault/view.component.ts +++ b/src/popup/vault/view.component.ts @@ -42,7 +42,7 @@ export class ViewComponent extends BaseViewComponent { ngOnInit() { this.showAttachments = !this.platformUtilsService.isEdge(); - this.route.queryParams.subscribe(async (params) => { + const queryParamsSub = this.route.queryParams.subscribe(async (params) => { if (params.cipherId) { this.cipherId = params.cipherId; } else { @@ -50,6 +50,7 @@ export class ViewComponent extends BaseViewComponent { } await this.load(); + queryParamsSub.unsubscribe(); }); super.ngOnInit(); }