alex/yomichan
1
Fork 0
Code Releases Activity

Fix the settings page trying to create a popup window (#1341)

Browse Source
This commit is contained in:
toasted-nutbread 2021-01-31 16:18:17 -05:00 committed by GitHub
parent b0b201fc6a
commit 6218b0d8f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/bg/js/settings/popup-preview-frame.js
View File

@ -73,6 +73,7 @@ class PopupPreviewFrame {
parentPopupId: null, parentPopupId: null,
parentFrameId: null, parentFrameId: null,
useProxyPopup: false, useProxyPopup: false,
canUseWindowPopup: false,
pageType: 'web', pageType: 'web',
allowRootFramePopupProxy: false, allowRootFramePopupProxy: false,
childrenSupported: false, childrenSupported: false,

4
ext/fg/js/frontend.js
View File

@ -32,6 +32,7 @@ class Frontend {
parentPopupId, parentPopupId,
parentFrameId, parentFrameId,
useProxyPopup, useProxyPopup,
canUseWindowPopup=true,
allowRootFramePopupProxy, allowRootFramePopupProxy,
childrenSupported=true, childrenSupported=true,
hotkeyHandler hotkeyHandler
@ -43,6 +44,7 @@ class Frontend {
this._parentPopupId = parentPopupId; this._parentPopupId = parentPopupId;
this._parentFrameId = parentFrameId; this._parentFrameId = parentFrameId;
this._useProxyPopup = useProxyPopup; this._useProxyPopup = useProxyPopup;
this._canUseWindowPopup = canUseWindowPopup;
this._allowRootFramePopupProxy = allowRootFramePopupProxy; this._allowRootFramePopupProxy = allowRootFramePopupProxy;
this._childrenSupported = childrenSupported; this._childrenSupported = childrenSupported;
this._hotkeyHandler = hotkeyHandler; this._hotkeyHandler = hotkeyHandler;
@ -371,7 +373,7 @@ class Frontend {
const currentPopup = this._popup; const currentPopup = this._popup;
let popupPromise; let popupPromise;
if (usePopupWindow) { if (usePopupWindow && this._canUseWindowPopup) {
popupPromise = this._popupCache.get('window'); popupPromise = this._popupCache.get('window');
if (typeof popupPromise === 'undefined') { if (typeof popupPromise === 'undefined') {
popupPromise = this._getPopupWindow(); popupPromise = this._getPopupWindow();