diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /browser/actors/PromptParent.sys.mjs | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/actors/PromptParent.sys.mjs')
-rw-r--r-- | browser/actors/PromptParent.sys.mjs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/browser/actors/PromptParent.sys.mjs b/browser/actors/PromptParent.sys.mjs index 1407e06a75..4a159cbda5 100644 --- a/browser/actors/PromptParent.sys.mjs +++ b/browser/actors/PromptParent.sys.mjs @@ -140,8 +140,7 @@ export class PromptParent extends JSWindowActorParent { (args.modalType === Ci.nsIPrompt.MODAL_TYPE_CONTENT && !lazy.contentPromptSubDialog) || (args.modalType === Ci.nsIPrompt.MODAL_TYPE_TAB && - !lazy.tabChromePromptSubDialog) || - this.isAboutAddonsOptionsPage(this.browsingContext) + !lazy.tabChromePromptSubDialog) ) { return this.openContentPrompt(args, id); } @@ -262,6 +261,11 @@ export class PromptParent extends JSWindowActorParent { let browsingContext = this.browsingContext.top; let browser = browsingContext.embedderElement; + + if (this.isAboutAddonsOptionsPage(browsingContext)) { + browser = browser.ownerGlobal.browsingContext.embedderElement; + } + let promptRequiresBrowser = args.modalType === Services.prompt.MODAL_TYPE_TAB || args.modalType === Services.prompt.MODAL_TYPE_CONTENT; |