зеркало из https://github.com/mozilla/gecko-dev.git
bug 162020 option to delay enabling confirmation buttons r=mkaply,sr=sspitzer
This commit is contained in:
Родитель
15db594a16
Коммит
e66742e59c
|
@ -2141,6 +2141,7 @@ nsScriptSecurityManager::CheckConfirmDialog(JSContext* cx, nsIPrincipal* aPrinci
|
||||||
|
|
||||||
PRInt32 buttonPressed = 1; // If the user exits by clicking the close box, assume No (button 1)
|
PRInt32 buttonPressed = 1; // If the user exits by clicking the close box, assume No (button 1)
|
||||||
rv = prompter->ConfirmEx(title.get(), message.get(),
|
rv = prompter->ConfirmEx(title.get(), message.get(),
|
||||||
|
(nsIPrompt::BUTTON_DELAY_ENABLE) +
|
||||||
(nsIPrompt::BUTTON_POS_1_DEFAULT) +
|
(nsIPrompt::BUTTON_POS_1_DEFAULT) +
|
||||||
(nsIPrompt::BUTTON_TITLE_YES * nsIPrompt::BUTTON_POS_0) +
|
(nsIPrompt::BUTTON_TITLE_YES * nsIPrompt::BUTTON_POS_0) +
|
||||||
(nsIPrompt::BUTTON_TITLE_NO * nsIPrompt::BUTTON_POS_1),
|
(nsIPrompt::BUTTON_TITLE_NO * nsIPrompt::BUTTON_POS_1),
|
||||||
|
|
|
@ -133,7 +133,10 @@ interface nsIPromptService : nsISupports
|
||||||
|
|
||||||
const unsigned long BUTTON_POS_0_DEFAULT = 0 << 24;
|
const unsigned long BUTTON_POS_0_DEFAULT = 0 << 24;
|
||||||
const unsigned long BUTTON_POS_1_DEFAULT = 1 << 24;
|
const unsigned long BUTTON_POS_1_DEFAULT = 1 << 24;
|
||||||
const unsigned long BUTTON_POS_2_DEFAULT = 2 << 24;
|
const unsigned long BUTTON_POS_2_DEFAULT = 2 << 24;
|
||||||
|
|
||||||
|
/* used for security dialogs, buttons are initially disabled */
|
||||||
|
const unsigned long BUTTON_DELAY_ENABLE = 1 << 26;
|
||||||
|
|
||||||
const unsigned long STD_OK_CANCEL_BUTTONS = (BUTTON_TITLE_OK * BUTTON_POS_0) +
|
const unsigned long STD_OK_CANCEL_BUTTONS = (BUTTON_TITLE_OK * BUTTON_POS_0) +
|
||||||
(BUTTON_TITLE_CANCEL * BUTTON_POS_1);
|
(BUTTON_TITLE_CANCEL * BUTTON_POS_1);
|
||||||
|
|
|
@ -52,7 +52,8 @@ interface nsPIPromptService : nsISupports
|
||||||
eButton0Text=8, eButton1Text=9, eButton2Text=10, eButton3Text=11,
|
eButton0Text=8, eButton1Text=9, eButton2Text=10, eButton3Text=11,
|
||||||
eDialogTitle=12};
|
eDialogTitle=12};
|
||||||
enum {eButtonPressed=0, eCheckboxState=1, eNumberButtons=2,
|
enum {eButtonPressed=0, eCheckboxState=1, eNumberButtons=2,
|
||||||
eNumberEditfields=3, eEditField1Password=4, eDefaultButton=5};
|
eNumberEditfields=3, eEditField1Password=4, eDefaultButton=5,
|
||||||
|
eDelayButtonEnable=6};
|
||||||
%}
|
%}
|
||||||
|
|
||||||
void doDialog(in nsIDOMWindow aParent, in nsIDialogParamBlock aParamBlock, in string aChromeURL);
|
void doDialog(in nsIDOMWindow aParent, in nsIDialogParamBlock aParamBlock, in string aChromeURL);
|
||||||
|
|
|
@ -291,6 +291,8 @@ nsPromptService::ConfirmEx(nsIDOMWindow *parent,
|
||||||
#define BUTTON_DEFAULT_MASK 0x03000000
|
#define BUTTON_DEFAULT_MASK 0x03000000
|
||||||
|
|
||||||
block->SetInt(eDefaultButton, (buttonFlags & BUTTON_DEFAULT_MASK) >> 24);
|
block->SetInt(eDefaultButton, (buttonFlags & BUTTON_DEFAULT_MASK) >> 24);
|
||||||
|
block->SetInt(eDelayButtonEnable, buttonFlags & BUTTON_DELAY_ENABLE);
|
||||||
|
|
||||||
PRInt32 numberButtons = 0;
|
PRInt32 numberButtons = 0;
|
||||||
for (int i = 0; i < 3; i++) {
|
for (int i = 0; i < 3; i++) {
|
||||||
|
|
||||||
|
|
|
@ -645,6 +645,8 @@ pref("security.directory", "");
|
||||||
pref("signed.applets.codebase_principal_support", false);
|
pref("signed.applets.codebase_principal_support", false);
|
||||||
pref("security.checkloaduri", true);
|
pref("security.checkloaduri", true);
|
||||||
pref("security.xpconnect.plugin.unrestricted", true);
|
pref("security.xpconnect.plugin.unrestricted", true);
|
||||||
|
// security-sensitive dialogs should delay focus. In milliseconds.
|
||||||
|
pref("security.dialog_enable_delay", 2000);
|
||||||
|
|
||||||
// Modifier key prefs: default to Windows settings,
|
// Modifier key prefs: default to Windows settings,
|
||||||
// menu access key = alt, accelerator key = control.
|
// menu access key = alt, accelerator key = control.
|
||||||
|
|
|
@ -87,8 +87,11 @@ interface nsIPrompt : nsISupports
|
||||||
|
|
||||||
const unsigned long BUTTON_POS_0_DEFAULT = 0 << 24;
|
const unsigned long BUTTON_POS_0_DEFAULT = 0 << 24;
|
||||||
const unsigned long BUTTON_POS_1_DEFAULT = 1 << 24;
|
const unsigned long BUTTON_POS_1_DEFAULT = 1 << 24;
|
||||||
const unsigned long BUTTON_POS_2_DEFAULT = 2 << 24;
|
const unsigned long BUTTON_POS_2_DEFAULT = 2 << 24;
|
||||||
|
|
||||||
|
/* used for security dialogs, buttons are initially disabled */
|
||||||
|
const unsigned long BUTTON_DELAY_ENABLE = 1 << 26;
|
||||||
|
|
||||||
const unsigned long STD_OK_CANCEL_BUTTONS = (BUTTON_TITLE_OK * BUTTON_POS_0) +
|
const unsigned long STD_OK_CANCEL_BUTTONS = (BUTTON_TITLE_OK * BUTTON_POS_0) +
|
||||||
(BUTTON_TITLE_CANCEL * BUTTON_POS_1);
|
(BUTTON_TITLE_CANCEL * BUTTON_POS_1);
|
||||||
|
|
||||||
|
|
|
@ -163,27 +163,56 @@ function commonDialogOnLoad()
|
||||||
|
|
||||||
if (gCommonDialogParam.GetInt(3) == 0) // If no text fields
|
if (gCommonDialogParam.GetInt(3) == 0) // If no text fields
|
||||||
{
|
{
|
||||||
|
var dButton;
|
||||||
var defaultButton = gCommonDialogParam.GetInt(5);
|
var defaultButton = gCommonDialogParam.GetInt(5);
|
||||||
switch (defaultButton) {
|
switch (defaultButton) {
|
||||||
case 3:
|
case 3:
|
||||||
document.documentElement.getButton("extra2").focus();
|
dButton = document.documentElement.getButton("extra2");
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
document.documentElement.getButton("extra1").focus();
|
dButton = document.documentElement.getButton("extra1");
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
document.documentElement.getButton("cancel").focus();
|
dButton = document.documentElement.getButton("cancel");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
case 0:
|
case 0:
|
||||||
document.documentElement.getButton("accept").focus();
|
dButton = document.documentElement.getButton("accept");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
// move the default attribute and focus from the accept button
|
||||||
|
// to the one specified in the dialog params
|
||||||
|
document.documentElement.getButton("accept").setAttribute("default",false);
|
||||||
|
dButton.setAttribute("default", true);
|
||||||
|
dButton.focus();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (gCommonDialogParam.GetInt(6) != 0) // delay button enable
|
||||||
|
{
|
||||||
|
var delayInterval = 2000;
|
||||||
|
try {
|
||||||
|
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
.getService(Components.interfaces.nsIPrefBranch);
|
||||||
|
delayInterval = prefs.getIntPref("security.dialog_enable_delay");
|
||||||
|
} catch (e) {}
|
||||||
|
|
||||||
|
document.documentElement.getButton("accept").disabled = true;
|
||||||
|
document.documentElement.getButton("extra1").disabled = true;
|
||||||
|
document.documentElement.getButton("extra2").disabled = true;
|
||||||
|
|
||||||
|
setTimeout(commonDialogReenableButtons, delayInterval);
|
||||||
}
|
}
|
||||||
|
|
||||||
getAttention();
|
getAttention();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function commonDialogReenableButtons()
|
||||||
|
{
|
||||||
|
document.documentElement.getButton("accept").disabled = false;
|
||||||
|
document.documentElement.getButton("extra1").disabled = false;
|
||||||
|
document.documentElement.getButton("extra2").disabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
function initTextbox(aName, aLabelIndex, aValueIndex, aAlwaysLabel)
|
function initTextbox(aName, aLabelIndex, aValueIndex, aAlwaysLabel)
|
||||||
{
|
{
|
||||||
unHideElementById(aName+"Container");
|
unHideElementById(aName+"Container");
|
||||||
|
|
|
@ -99,9 +99,26 @@ function onLoad()
|
||||||
// Move default+focus from |accept| to |cancel| button.
|
// Move default+focus from |accept| to |cancel| button.
|
||||||
var aButton = document.documentElement.getButton("accept");
|
var aButton = document.documentElement.getButton("accept");
|
||||||
aButton.setAttribute("default", false);
|
aButton.setAttribute("default", false);
|
||||||
|
aButton.setAttribute("label", gBundle.getString("OK"));
|
||||||
|
aButton.setAttribute("disabled", true);
|
||||||
|
|
||||||
aButton = document.documentElement.getButton("cancel");
|
aButton = document.documentElement.getButton("cancel");
|
||||||
aButton.focus();
|
aButton.focus();
|
||||||
aButton.setAttribute("default", true);
|
aButton.setAttribute("default", true);
|
||||||
|
|
||||||
|
// start timer to re-enable buttons
|
||||||
|
var delayInterval = 2000;
|
||||||
|
try {
|
||||||
|
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||||
|
.getService(Components.interfaces.nsIPrefBranch);
|
||||||
|
delayInterval = prefs.getIntPref("security.dialog_enable_delay");
|
||||||
|
} catch (e) {}
|
||||||
|
setTimeout(reenableInstallButtons, delayInterval);
|
||||||
|
}
|
||||||
|
|
||||||
|
function reenableInstallButtons()
|
||||||
|
{
|
||||||
|
document.documentElement.getButton("accept").setAttribute("disabled", false);
|
||||||
}
|
}
|
||||||
|
|
||||||
function onAccept()
|
function onAccept()
|
||||||
|
|
Загрузка…
Ссылка в новой задаче