bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 07:13:32 +00:00
Code Issues Releases Wiki Activity

reload window popup when opened on safari

Browse Source
This commit is contained in:
Kyle Spearrin
2018-01-12 12:22:55 -05:00
parent a4bda84a3c
commit c5c95aacb3
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/background/main.background.ts
View File

@@ -162,11 +162,11 @@ export default class MainBackground {
await new Analytics(window).init(); await new Analytics(window).init();
this.containerService.attachToWindow(window); this.containerService.attachToWindow(window);
await this.runtimeBackground.init();
if (!this.isSafari) { if (!this.isSafari) {
await this.commandsBackground.init(); await this.commandsBackground.init();
await this.contextMenusBackground.init(); await this.contextMenusBackground.init();
await this.idleBackground.init(); await this.idleBackground.init();
await this.runtimeBackground.init();
await this.tabsBackground.init(); await this.tabsBackground.init();
await this.webRequestBackground.init(); await this.webRequestBackground.init();
await this.windowsBackground.init(); await this.windowsBackground.init();

20
src/background/runtime.background.ts
View File

@@ -17,10 +17,12 @@ export default class RuntimeBackground {
private runtime: any; private runtime: any;
private autofillTimeout: number; private autofillTimeout: number;
private pageDetailsToAutoFill: any[] = []; private pageDetailsToAutoFill: any[] = [];
private isSafari: boolean;
constructor(private main: MainBackground, private autofillService: AutofillService, constructor(private main: MainBackground, private autofillService: AutofillService,
private cipherService: CipherService, private platformUtilsService: PlatformUtilsService) { private cipherService: CipherService, private platformUtilsService: PlatformUtilsService) {
this.runtime = chrome.runtime; this.isSafari = this.platformUtilsService.isSafari();
this.runtime = this.isSafari ? safari.application : chrome.runtime;
} }
async init() { async init() {
@@ -28,6 +30,22 @@ export default class RuntimeBackground {
return; return;
} }
if (this.isSafari) {
// Reload the popup when it's opened
this.runtime.addEventListener('popover', (event: any) => {
const win: Window = event.target.contentWindow;
const body = win.document.body;
let child: Node = body.firstChild;
while (child) {
body.removeChild(child);
child = body.firstChild;
}
win.location.reload();
}, true);
return;
}
if (this.runtime.onInstalled) { if (this.runtime.onInstalled) {
this.runtime.onInstalled.addListener((details: any) => { this.runtime.onInstalled.addListener((details: any) => {
(window as any).ga('send', { (window as any).ga('send', {