wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 22:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Re-implement prompts.tab_modal.focusSwitch control in toolkit.

Browse source
This commit is contained in:
wolfbeast 2018-07-03 04:16:11 +02:00 • committed by Roy Tam
commit 21ea79484b
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
toolkit/components/prompts/src/nsPrompter.js
View file

@ -369,7 +369,13 @@ function openTabPrompt(domWin, tabPrompt, args) {
.getInterface(Ci.nsIDocShell); .getInterface(Ci.nsIDocShell);
let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload;
let eventDetail = Cu.cloneInto({tabPrompt: true, inPermitUnload}, domWin); 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) let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor)
.getInterface(Ci.nsIDOMWindowUtils); .getInterface(Ci.nsIDOMWindowUtils);
@ -395,8 +401,8 @@ function openTabPrompt(domWin, tabPrompt, args) {
frameMM.removeEventListener("pagehide", pagehide, true); frameMM.removeEventListener("pagehide", pagehide, true);
winUtils.leaveModalState(); winUtils.leaveModalState();
if (allowFocusSwitch)
PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed"); PromptUtils.fireDialogEvent(domWin, "DOMModalDialogClosed");
} }
frameMM.addEventListener("pagehide", pagehide, true); frameMM.addEventListener("pagehide", pagehide, true);