diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /browser/components/preferences/preferences.js | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/preferences/preferences.js')
-rw-r--r-- | browser/components/preferences/preferences.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js index 0cd498fd96..34d6a9b11d 100644 --- a/browser/components/preferences/preferences.js +++ b/browser/components/preferences/preferences.js @@ -264,7 +264,7 @@ function init_all() { return; } let mainWindow = window.browsingContext.topChromeWindow; - mainWindow.BrowserOpenAddonsMgr(); + mainWindow.BrowserAddonUI.openAddonsMgr(); }); document.dispatchEvent( @@ -575,8 +575,9 @@ async function confirmRestartPrompt( break; } - let buttonIndex = Services.prompt.confirmEx( - window, + let button = await Services.prompt.asyncConfirmEx( + window.browsingContext, + Ci.nsIPrompt.MODAL_TYPE_CONTENT, title, msg, buttonFlags, @@ -587,6 +588,8 @@ async function confirmRestartPrompt( {} ); + let buttonIndex = button.get("buttonNumClicked"); + // If we have the second confirmation dialog for restart, see if the user // cancels out at that point. if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) { |