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

window reload if there is a sidebar, resolves #900

Browse Source
This commit is contained in:
Kyle Spearrin
2019-04-04 11:50:49 -04:00
parent 109d800a36
commit 8cc268cd6c
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/popup/app.component.ts
View File

@@ -31,6 +31,7 @@ import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
import { AuthService } from 'jslib/abstractions/auth.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { StateService } from 'jslib/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service';
@@ -66,7 +67,7 @@ export class AppComponent implements OnInit {
private i18nService: I18nService, private router: Router,
private stateService: StateService, private messagingService: MessagingService,
private changeDetectorRef: ChangeDetectorRef, private ngZone: NgZone,
private sanitizer: DomSanitizer) { }
private sanitizer: DomSanitizer, private platformUtilsService: PlatformUtilsService) { }
ngOnInit() {
if (BrowserApi.getBackgroundPage() == null) {
@@ -116,8 +117,12 @@ export class AppComponent implements OnInit {
properties: { label: msg.label },
});
} else if (msg.command === 'reloadProcess') {
// Wait to make sure background has reloaded first.
window.setTimeout(() => BrowserApi.reloadExtension(window, true), 2000);
const windowReload = this.platformUtilsService.isSafari() ||
this.platformUtilsService.isFirefox() || this.platformUtilsService.isOpera();
if (windowReload) {
// Wait to make sure background has reloaded first.
window.setTimeout(() => BrowserApi.reloadExtension(window), 2000);
}
} else {
msg.webExtSender = sender;
this.broadcasterService.send(msg);