alex/yomichan
1
Fork 0
Code Releases Activity

Merge pull request #211 from toasted-nutbread/validate-content-window

Browse Source 
Validate contentWindow before focus
This commit is contained in:
Alex Yatskov 2019-09-14 17:31:23 -07:00 committed by GitHub
commit 88a6128e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/fg/js/popup.js
View File

@ -239,9 +239,12 @@ class Popup {
} }
focusParent() { focusParent() {
if (this.parent && this.parent.container) { if (this.parent !== null) {
// Chrome doesn't like focusing iframe without contentWindow. // Chrome doesn't like focusing iframe without contentWindow.
this.parent.container.contentWindow.focus(); const contentWindow = this.parent.container.contentWindow;
if (contentWindow !== null) {
contentWindow.focus();
}
} else { } else {
// Firefox doesn't like focusing window without first blurring the iframe. // Firefox doesn't like focusing window without first blurring the iframe.
// this.container.contentWindow.blur() doesn't work on Firefox for some reason. // this.container.contentWindow.blur() doesn't work on Firefox for some reason.