From 4b76d6427a6650a499f8840fb8b054be70dd1c35 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Tue, 3 Jul 2018 04:16:11 +0200 Subject: Re-implement prompts.tab_modal.focusSwitch control in toolkit. --- toolkit/components/prompts/src/nsPrompter.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'toolkit/components') diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index 26efe28cc..0503b5925 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -369,7 +369,13 @@ function openTabPrompt(domWin, tabPrompt, args) { .getInterface(Ci.nsIDocShell); let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; let eventDetail = Cu.cloneInto({tabPrompt: true, inPermitUnload}, domWin); - PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); + let allowFocusSwitch = true; + try { + allowFocusSwitch = Services.prefs.getBoolPref("prompts.tab_modal.focusSwitch"); + } catch(e) {} + + if (allowFocusSwitch) + PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDOMWindowUtils); @@ -395,8 +401,8 @@ function openTabPrompt(domWin, tabPrompt, args) { frameMM.removeEventListener("pagehide", pagehide, true); winUtils.leaveModalState(); - - PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed"); + if (allowFocusSwitch) + PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed"); } frameMM.addEventListener("pagehide", pagehide, true); -- cgit v1.2.3