aboutsummaryrefslogtreecommitdiff
path: root/ext/fg
diff options
context:
space:
mode:
authortoasted-nutbread <toasted-nutbread@users.noreply.github.com>2020-11-24 11:54:08 -0500
committerGitHub <noreply@github.com>2020-11-24 11:54:08 -0500
commitde299c64ae0d32f316d1679b79dd1ad72e1c0ed9 (patch)
treee33bca0a10693a6d8dcdad3c516da26d26b6250f /ext/fg
parent068b1eef71ed1167e7e39effa00cda7deb9251f2 (diff)
Display updates (#1057)
* Fix history assignment on the search page * Use clear instead of assigned * Simplify definitions assignment * Organize * Fix query not being cleared * Fix media loading * Fix potential issue with options not being assigned * Catch error when frameId is null, causing infinite loop * Fix frontend construction parameters
Diffstat (limited to 'ext/fg')
-rw-r--r--ext/fg/js/popup-factory.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/fg/js/popup-factory.js b/ext/fg/js/popup-factory.js
index d63ed17a..252bcdf4 100644
--- a/ext/fg/js/popup-factory.js
+++ b/ext/fg/js/popup-factory.js
@@ -114,7 +114,7 @@ class PopupFactory {
const popup = new Popup({
id,
depth,
- frameId,
+ frameId: this._frameId,
ownerFrameId,
childrenSupported
});
@@ -129,6 +129,9 @@ class PopupFactory {
popup.prepare();
return popup;
} else {
+ if (frameId === null) {
+ throw new Error('Invalid frameId');
+ }
const useFrameOffsetForwarder = (parentPopupId === null);
({id, depth, frameId} = await api.crossFrame.invoke(frameId, 'getOrCreatePopup', {
id,