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

cleanup for safari

Browse Source
This commit is contained in:
Kyle Spearrin
2019-08-21 09:42:34 -04:00
parent d8f423711a
commit d2083c2665
7 changed files with 15 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/popup/accounts/two-factor.component.ts
View File

@@ -50,6 +50,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
}
async ngOnInit() {
/*
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
this.ngZone.run(async () => {
switch (message.command) {
@@ -65,6 +66,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
this.changeDetectorRef.detectChanges();
});
});
*/
const isFirefox = this.platformUtilsService.isFirefox();
if (this.popupUtilsService.inPopup(window) && isFirefox &&
@@ -72,8 +74,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
// ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1562620
this.initU2f = false;
}
/*
const isSafari = this.platformUtilsService.isSafari();
this.showNewWindowMessage = isSafari;
*/
await super.ngOnInit();
@@ -81,7 +85,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
return;
}
if (!isSafari && this.selectedProviderType === TwoFactorProviderType.Email &&
if (/*!isSafari && */this.selectedProviderType === TwoFactorProviderType.Email &&
this.popupUtilsService.inPopup(window)) {
const confirmed = await this.platformUtilsService.showDialog(this.i18nService.t('popup2faCloseMessage'),
null, this.i18nService.t('yes'), this.i18nService.t('no'));
@@ -99,6 +103,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
}
}
/*
const isDuo = this.selectedProviderType === TwoFactorProviderType.Duo ||
this.selectedProviderType === TwoFactorProviderType.OrganizationDuo;
if (!isSafari || !isDuo) {
@@ -118,6 +123,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
},
});
}, 500);
*/
}
ngOnDestroy() {