vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Close the popout as expected on Firefox on Android (#695)

This commit is contained in:
Daniel Aleksandersen 2018-08-15 03:27:55 +02:00 committed by Kyle Spearrin
parent 6c82c2d388
commit 2d6107fae1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/browser/browserApi.ts
View File

@ -1,7 +1,10 @@
export class BrowserApi { export class BrowserApi {
static isWebExtensionsApi: boolean = (typeof browser !== 'undefined');
static isSafariApi: boolean = (typeof safari !== 'undefined') && static isSafariApi: boolean = (typeof safari !== 'undefined') &&
navigator.userAgent.indexOf(' Safari/') !== -1 && navigator.userAgent.indexOf('Chrome') === -1; navigator.userAgent.indexOf(' Safari/') !== -1 && navigator.userAgent.indexOf('Chrome') === -1;
static isChromeApi: boolean = !BrowserApi.isSafariApi && (typeof chrome !== 'undefined'); static isChromeApi: boolean = !BrowserApi.isSafariApi && (typeof chrome !== 'undefined');
static isFirefoxOnAndroid: boolean =
navigator.userAgent.indexOf('Firefox/') !== -1 && navigator.userAgent.indexOf('Android') !== -1;
static async getTabFromCurrentWindowId(): Promise<any> { static async getTabFromCurrentWindowId(): Promise<any> {
if (BrowserApi.isChromeApi) { if (BrowserApi.isChromeApi) {
@ -203,7 +206,12 @@ export class BrowserApi {
} }
static closePopup(win: Window) { static closePopup(win: Window) {
if (BrowserApi.isChromeApi) { if (BrowserApi.isWebExtensionsApi && BrowserApi.isFirefoxOnAndroid) {
// COMPAT: Reactivating the active tab dismisses the popout-tab. The promise final
// condition is only called if the popout wasn't already dismissed (future proofing).
// BUGZILLA: https://bugzilla.mozilla.org/show_bug.cgi?id=1433604
browser.tabs.update({active: true}).finally(win.close);
} else if (browserApi.isWebExtensionsApi || BrowserApi.isChromeApi) {
win.close(); win.close();
} else if (BrowserApi.isSafariApi && safari.extension.popovers && safari.extension.popovers.length > 0) { } else if (BrowserApi.isSafariApi && safari.extension.popovers && safari.extension.popovers.length > 0) {
safari.extension.popovers[0].hide(); safari.extension.popovers[0].hide();