Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-31 17:57:43 +01:00
Code Issues Projects Releases Wiki Activity

browser api for closing popup

Browse Source
This commit is contained in:
Kyle Spearrin 2018-01-12 16:42:47 -05:00
parent c15a2f5747
commit 4fc21767be
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/browser/browserApi.ts
View File

@ -170,6 +170,14 @@ class BrowserApi {
} }
} }
static closePopup(win: Window) {
if (BrowserApi.isChromeApi) {
win.close();
} else if (BrowserApi.isSafariApi && safari.extension.popovers && safari.extension.popovers.length > 0) {
safari.extension.popovers[0].hide();
}
}
private static makeTabObject(tab: any) { private static makeTabObject(tab: any) {
if (BrowserApi.isChromeApi) { if (BrowserApi.isChromeApi) {
return tab; return tab;

2
src/popup/app/components/action-buttons.component.ts
View File

@ -27,7 +27,7 @@ export class ActionButtonsController implements ng.IController {
self.$analytics.eventTrack('Launched Website From Listing'); self.$analytics.eventTrack('Launched Website From Listing');
BrowserApi.createNewTab(self.cipher.login.uri); BrowserApi.createNewTab(self.cipher.login.uri);
if (PopupUtilsService.inPopup(self.$window)) { if (PopupUtilsService.inPopup(self.$window)) {
self.$window.close(); BrowserApi.closePopup(self.$window);
} }
} }
}); });

2
src/popup/app/components/pop-out.component.ts
View File

@ -42,7 +42,7 @@ export class PopOutController implements ng.IController {
}); });
if (PopupUtilsService.inPopup(this.$window)) { if (PopupUtilsService.inPopup(this.$window)) {
this.$window.close(); BrowserApi.closePopup(this.$window);
} }
} else if ((typeof chrome !== 'undefined') && chrome.tabs && chrome.tabs.create) { } else if ((typeof chrome !== 'undefined') && chrome.tabs && chrome.tabs.create) {
href = href.replace('uilocation=popup', 'uilocation=tab') href = href.replace('uilocation=popup', 'uilocation=tab')

2
src/popup/app/current/current.component.ts
View File

@ -90,7 +90,7 @@ export class CurrentController {
this.utilsService.copyToClipboard(totpCode, document); this.utilsService.copyToClipboard(totpCode, document);
} }
if (PopupUtilsService.inPopup(this.$window)) { if (PopupUtilsService.inPopup(this.$window)) {
this.$window.close(); BrowserApi.closePopup(this.$window);
} }
}).catch(() => { }).catch(() => {
this.$analytics.eventTrack('Autofilled Error'); this.$analytics.eventTrack('Autofilled Error');