summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2021-01-31 16:18:17 -0500
committerGitHub <noreply@github.com>2021-01-31 16:18:17 -0500
commit6218b0d8f778d08a4e1a7087b796b45b215041ce (patch)
tree575d72c08968554ba56b0936e445a54816fec2ef /ext
parentb0b201fc6afb6d46b0171a0b39932b7591818920 (diff)
Fix the settings page trying to create a popup window (#1341)
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/settings/popup-preview-frame.js1
-rw-r--r--ext/fg/js/frontend.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/bg/js/settings/popup-preview-frame.js b/ext/bg/js/settings/popup-preview-frame.js
index 92b57c7a..73ac6caf 100644
--- a/ext/bg/js/settings/popup-preview-frame.js
+++ b/ext/bg/js/settings/popup-preview-frame.js
@@ -73,6 +73,7 @@ class PopupPreviewFrame {
parentPopupId: null,
parentFrameId: null,
useProxyPopup: false,
+ canUseWindowPopup: false,
pageType: 'web',
allowRootFramePopupProxy: false,
childrenSupported: false,
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 94edeb12..f02d5609 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -32,6 +32,7 @@ class Frontend {
parentPopupId,
parentFrameId,
useProxyPopup,
+ canUseWindowPopup=true,
allowRootFramePopupProxy,
childrenSupported=true,
hotkeyHandler
@@ -43,6 +44,7 @@ class Frontend {
this._parentPopupId = parentPopupId;
this._parentFrameId = parentFrameId;
this._useProxyPopup = useProxyPopup;
+ this._canUseWindowPopup = canUseWindowPopup;
this._allowRootFramePopupProxy = allowRootFramePopupProxy;
this._childrenSupported = childrenSupported;
this._hotkeyHandler = hotkeyHandler;
@@ -371,7 +373,7 @@ class Frontend {
const currentPopup = this._popup;
let popupPromise;
- if (usePopupWindow) {
+ if (usePopupWindow && this._canUseWindowPopup) {
popupPromise = this._popupCache.get('window');
if (typeof popupPromise === 'undefined') {
popupPromise = this._getPopupWindow();