1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00

browserUtilsService.isViewOpen

This commit is contained in:
Kyle Spearrin
2018-01-04 16:49:58 -05:00
parent 701d81a2eb
commit 2986bd1e29
3 changed files with 21 additions and 18 deletions

View File

@@ -29,12 +29,7 @@ export default class LockService {
}
async checkLock(): Promise<void> {
const popupOpen = chrome.extension.getViews({ type: 'popup' }).length > 0;
const tabOpen = chrome.extension.getViews({ type: 'tab' }).length > 0;
const sidebarView = this.sidebarViewName();
const sidebarOpen = sidebarView != null && chrome.extension.getViews({ type: sidebarView }).length > 0;
if (popupOpen || tabOpen || sidebarOpen) {
if (this.browserUtilsService.isViewOpen()) {
// Do not lock
return;
}
@@ -77,16 +72,4 @@ export default class LockService {
this.cipherService.clearCache();
this.collectionService.clearCache();
}
// Helpers
private sidebarViewName(): string {
if ((window as any).chrome.sidebarAction && this.browserUtilsService.isFirefox()) {
return 'sidebar';
} else if (this.browserUtilsService.isOpera() && (typeof opr !== 'undefined') && opr.sidebarAction) {
return 'sidebar_panel';
}
return null;
}
}