From aa290c50ecfcc1c0160f6f8bbee3be2d76ea0109 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 6 Mar 2019 14:31:50 -0500
Subject: [PATCH] call init functions rather than super

---
 jslib                                           | 2 +-
 src/popup/settings/folder-add-edit.component.ts | 2 +-
 src/popup/vault/attachments.component.ts        | 2 +-
 src/popup/vault/collections.component.ts        | 2 +-
 src/popup/vault/password-history.component.ts   | 3 +--
 src/popup/vault/share.component.ts              | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/jslib b/jslib
index 965e35604c5..199884e6ae8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 965e35604c584f7dcf786f04933c9b2fcf8a4ba0
+Subproject commit 199884e6ae8f8b2c876ed361a3ba37c1f496e356
diff --git a/src/popup/settings/folder-add-edit.component.ts b/src/popup/settings/folder-add-edit.component.ts
index 98b1c8fa83b..dc7727d8ddc 100644
--- a/src/popup/settings/folder-add-edit.component.ts
+++ b/src/popup/settings/folder-add-edit.component.ts
@@ -28,7 +28,7 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent {
             if (params.folderId) {
                 this.folderId = params.folderId;
             }
-            await super.ngOnInit();
+            await this.init();
             if (queryParamsSub != null) {
                 queryParamsSub.unsubscribe();
             }
diff --git a/src/popup/vault/attachments.component.ts b/src/popup/vault/attachments.component.ts
index 9faf3c22d16..cee36949756 100644
--- a/src/popup/vault/attachments.component.ts
+++ b/src/popup/vault/attachments.component.ts
@@ -25,7 +25,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
     async ngOnInit() {
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             this.cipherId = params.cipherId;
-            await super.ngOnInit();
+            await this.init();
             if (queryParamsSub != null) {
                 queryParamsSub.unsubscribe();
             }
diff --git a/src/popup/vault/collections.component.ts b/src/popup/vault/collections.component.ts
index 6b3e22c850b..573e2fd0e43 100644
--- a/src/popup/vault/collections.component.ts
+++ b/src/popup/vault/collections.component.ts
@@ -26,7 +26,7 @@ export class CollectionsComponent extends BaseCollectionsComponent {
         });
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             this.cipherId = params.cipherId;
-            await super.ngOnInit();
+            await this.load();
             if (queryParamsSub != null) {
                 queryParamsSub.unsubscribe();
             }
diff --git a/src/popup/vault/password-history.component.ts b/src/popup/vault/password-history.component.ts
index 9b5daf0c8e0..811ba76e696 100644
--- a/src/popup/vault/password-history.component.ts
+++ b/src/popup/vault/password-history.component.ts
@@ -28,8 +28,7 @@ export class PasswordHistoryComponent extends BasePasswordHistoryComponent {
             } else {
                 this.close();
             }
-
-            await super.ngOnInit();
+            await this.init();
             if (queryParamsSub != null) {
                 queryParamsSub.unsubscribe();
             }
diff --git a/src/popup/vault/share.component.ts b/src/popup/vault/share.component.ts
index e20db47a4d2..e6ad39667c9 100644
--- a/src/popup/vault/share.component.ts
+++ b/src/popup/vault/share.component.ts
@@ -31,7 +31,7 @@ export class ShareComponent extends BaseShareComponent {
         });
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             this.cipherId = params.cipherId;
-            await super.ngOnInit();
+            await this.load();
             if (queryParamsSub != null) {
                 queryParamsSub.unsubscribe();
             }