Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging changes on MOZILLA_1_7_BRANCH between AVIARY_1_0_20040515_BASE and MOZILLA_1_7_RELEASE: bug 162020.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/AVIARY_1_0_20040515_BRANCH@158214 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2004-06-20 20:48:30 +00:00
parent 192bc1c23c
commit 2ba030b591
8 changed files with 65 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/caps/src/nsScriptSecurityManager.cpp
View File

@@ -2113,6 +2113,7 @@ nsScriptSecurityManager::CheckConfirmDialog(JSContext* cx, nsIPrincipal* aPrinci
PRInt32 buttonPressed = 1; // If the user exits by clicking the close box, assume No (button 1)
rv = prompter->ConfirmEx(title.get(), message.get(),
(nsIPrompt::BUTTON_DELAY_ENABLE) +
(nsIPrompt::BUTTON_POS_1_DEFAULT) +
(nsIPrompt::BUTTON_TITLE_YES * nsIPrompt::BUTTON_POS_0) +
(nsIPrompt::BUTTON_TITLE_NO * nsIPrompt::BUTTON_POS_1),

5
mozilla/embedding/components/windowwatcher/public/nsIPromptService.idl
View File

@@ -134,7 +134,10 @@ interface nsIPromptService : nsISupports
const unsigned long BUTTON_POS_0_DEFAULT = 0 << 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) +
(BUTTON_TITLE_CANCEL * BUTTON_POS_1);

3
mozilla/embedding/components/windowwatcher/public/nsPIPromptService.idl
View File

@@ -53,7 +53,8 @@ interface nsPIPromptService : nsISupports
eButton0Text=8, eButton1Text=9, eButton2Text=10, eButton3Text=11,
eDialogTitle=12};
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);

1
mozilla/embedding/components/windowwatcher/src/nsPromptService.cpp
View File

@@ -302,6 +302,7 @@ nsPromptService::ConfirmEx(nsIDOMWindow *parent,
block->SetInt(eDefaultButton, 0);
break;
}
block->SetInt(eDelayButtonEnable, buttonFlags & BUTTON_DELAY_ENABLE);
PRInt32 numberButtons = 0;
for (int i = 0; i < 3; i++) {

2
mozilla/modules/libpref/src/init/all.js
View File

@@ -648,6 +648,8 @@ pref("security.directory", "");
pref("signed.applets.codebase_principal_support", false);
pref("security.checkloaduri", true);
pref("security.xpconnect.plugin.unrestricted", true);
// security-sensitive dialogs should delay button enabling. In milliseconds.
pref("security.dialog_enable_delay", 2000);
// Modifier key prefs: default to Windows settings,
// menu access key = alt, accelerator key = control.

7
mozilla/netwerk/base/public/nsIPrompt.idl
View File

@@ -87,8 +87,11 @@ interface nsIPrompt : nsISupports
const unsigned long BUTTON_POS_0_DEFAULT = 0 << 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) +
(BUTTON_TITLE_CANCEL * BUTTON_POS_1);

37
mozilla/xpfe/global/resources/content/commonDialog.js
View File

@@ -163,27 +163,56 @@ function commonDialogOnLoad()
if (gCommonDialogParam.GetInt(3) == 0) // If no text fields
{
var dButton;
var defaultButton = gCommonDialogParam.GetInt(5);
switch (defaultButton) {
case 3:
document.documentElement.getButton("extra2").focus();
dButton = document.documentElement.getButton("extra2");
break;
case 2:
document.documentElement.getButton("extra1").focus();
dButton = document.documentElement.getButton("extra1");
break;
case 1:
document.documentElement.getButton("cancel").focus();
dButton = document.documentElement.getButton("cancel");
break;
default:
case 0:
document.documentElement.getButton("accept").focus();
dButton = document.documentElement.getButton("accept");
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();
}
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)
{
unHideElementById(aName+"Container");

17
mozilla/xpinstall/res/content/institems.js
View File

@@ -80,9 +80,26 @@ function onLoad()
// Move default+focus from |accept| to |cancel| button.
var aButton = document.documentElement.getButton("accept");
aButton.setAttribute("default", false);
aButton.setAttribute("label", gBundle.getString("OK"));
aButton.setAttribute("disabled", true);
aButton = document.documentElement.getButton("cancel");
aButton.focus();
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()