Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 44146, improperly parented modal dialogs, r=danm

Browse Source
This commit is contained in:
morse%netscape.com 2000-07-12 02:29:53 +00:00
parent a19a875444
commit 0ecffed2f7
10 changed files with 90 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/wallet/public/nsIWalletService.idl
View File

@ -49,13 +49,13 @@ native nsAutoString(nsAutoString);
interface nsIWalletService : nsISupports {
[noscript]void WALLET_PreEdit(in nsAutoStringRef walletList);
[noscript]void WALLET_PostEdit(in nsAutoString walletList);
void WALLET_ChangePassword();
boolean WALLET_ChangePassword();
void WALLET_DeleteAll();
void WALLET_RequestToCapture(in nsIPresShell shell);
void WALLET_Prefill(in nsIPresShell shell, in boolean quick);
PRUint32 WALLET_RequestToCapture(in nsIPresShell shell);
boolean WALLET_Prefill(in nsIPresShell shell, in boolean quick);
[noscript]void WALLET_PrefillReturn(in nsAutoString results);
void WALLET_FetchFromNetCenter();
void WALLET_ExpirePassword();
boolean WALLET_ExpirePassword();
void SI_RemoveUser(in string key, in wstring userName);
void SI_StorePassword(in string key, in wstring userName, in wstring pwd);

16
extensions/wallet/src/nsWalletService.cpp
View File

@ -79,8 +79,8 @@ NS_IMETHODIMP nsWalletlibService::WALLET_PostEdit(nsAutoString walletList) {
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_ChangePassword() {
::WLLT_ChangePassword();
NS_IMETHODIMP nsWalletlibService::WALLET_ChangePassword(PRBool* status) {
::WLLT_ChangePassword(status);
return NS_OK;
}
@ -89,13 +89,13 @@ NS_IMETHODIMP nsWalletlibService::WALLET_DeleteAll() {
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_RequestToCapture(nsIPresShell* shell) {
::WLLT_RequestToCapture(shell);
NS_IMETHODIMP nsWalletlibService::WALLET_RequestToCapture(nsIPresShell* shell, PRUint32* status) {
::WLLT_RequestToCapture(shell, status);
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_Prefill(nsIPresShell* shell, PRBool quick) {
return ::WLLT_Prefill(shell, quick);
NS_IMETHODIMP nsWalletlibService::WALLET_Prefill(nsIPresShell* shell, PRBool quick, PRBool* doPrefillMessage) {
return ::WLLT_Prefill(shell, quick, doPrefillMessage);
}
NS_IMETHODIMP nsWalletlibService::WALLET_PrefillReturn(nsAutoString results){
@ -108,8 +108,8 @@ NS_IMETHODIMP nsWalletlibService::WALLET_FetchFromNetCenter(){
return NS_OK;
}
NS_IMETHODIMP nsWalletlibService::WALLET_ExpirePassword(){
::WLLT_ExpirePassword();
NS_IMETHODIMP nsWalletlibService::WALLET_ExpirePassword(PRBool* status){
::WLLT_ExpirePassword(status);
return NS_OK;
}

56
extensions/wallet/src/wallet.cpp
View File

@ -1061,36 +1061,25 @@ PRIVATE nsresult DecryptString (const char * crypt, char *& text) {
}
PUBLIC void
WLLT_ExpirePassword() {
WLLT_ExpirePassword(PRBool* status) {
nsresult rv = wallet_CryptSetup();
if (NS_SUCCEEDED(rv)) {
rv = gSecretDecoderRing->Logout();
}
PRUnichar * message;
if (NS_FAILED(rv)) {
message = Wallet_Localize("PasswordNotExpired");
} else {
message = Wallet_Localize("PasswordExpired");
}
Wallet_Alert(message);
Recycle(message);
*status = NS_SUCCEEDED(rv);
}
PRBool changingPassword = PR_FALSE;
PUBLIC
void WLLT_ChangePassword() {
PUBLIC void
WLLT_ChangePassword(PRBool* status) {
nsresult rv = wallet_CryptSetup();
if (NS_SUCCEEDED(rv)) {
changingPassword = PR_TRUE;
rv = gSecretDecoderRing->ChangePassword();
changingPassword = PR_FALSE;
}
if (NS_FAILED(rv)) {
PRUnichar * message = Wallet_Localize("PasswordNotChanged");
Wallet_Alert(message);
Recycle(message);
}
*status = NS_SUCCEEDED(rv);
}
PUBLIC nsresult
@ -2873,16 +2862,11 @@ WLLT_PreEdit(nsString& walletList)
PUBLIC void
WLLT_DeleteAll() {
PRUnichar * message;
message = Wallet_Localize("AllDataWillBeCleared");
if (Wallet_Confirm(message)) {
wallet_Initialize(PR_FALSE);
wallet_Clear(&wallet_SchemaToValue_list);
wallet_WriteToFile(schemaValueFileName, wallet_SchemaToValue_list);
SI_DeleteAll();
SI_SetBoolPref(pref_Crypto, PR_FALSE);
}
Recycle(message);
wallet_Initialize(PR_FALSE);
wallet_Clear(&wallet_SchemaToValue_list);
wallet_WriteToFile(schemaValueFileName, wallet_SchemaToValue_list);
SI_DeleteAll();
SI_SetBoolPref(pref_Crypto, PR_FALSE);
}
MODULE_PRIVATE int PR_CALLBACK
@ -3102,9 +3086,10 @@ WLLT_PrefillReturn(const nsString& results)
* get the form elements on the current page and prefill them if possible
*/
PUBLIC nsresult
WLLT_Prefill(nsIPresShell* shell, PRBool quick)
WLLT_Prefill(nsIPresShell* shell, PRBool quick, PRBool* doPrefillMessage)
{
nsAutoString urlName;
*doPrefillMessage = PR_FALSE;
/* create list of elements that can be prefilled */
nsVoidArray *wallet_PrefillElement_list=new nsVoidArray();
@ -3210,11 +3195,7 @@ WLLT_Prefill(nsIPresShell* shell, PRBool quick)
/* return if no elements were put into the list */
if (LIST_COUNT(wallet_PrefillElement_list) == 0) {
if (!gEncryptionFailure) {
PRUnichar * message = Wallet_Localize("noPrefills");
Wallet_Alert(message);
Recycle(message);
}
*doPrefillMessage = !gEncryptionFailure;
return NS_ERROR_FAILURE; // indicates to caller not to display preview screen
}
@ -3265,7 +3246,7 @@ WLLT_Prefill(nsIPresShell* shell, PRBool quick)
}
PUBLIC void
WLLT_RequestToCapture(nsIPresShell* shell) {
WLLT_RequestToCapture(nsIPresShell* shell, PRUint32* status) {
/* starting with the present shell, get each form element and put them on a list */
nsresult result;
PRInt32 captureCount = 0;
@ -3349,16 +3330,13 @@ WLLT_RequestToCapture(nsIPresShell* shell) {
}
}
}
PRUnichar * message;
if (gEncryptionFailure) {
message = Wallet_Localize("UnableToCapture");
*status = -1; /* UnableToCapture */
} else if (captureCount) {
message = Wallet_Localize("Captured");
*status = 0; /* Captured */
} else {
message = Wallet_Localize("NotCaptured");
*status = +1; /* NotCaptured */
}
Wallet_Alert(message);
Recycle(message);
}
/* should move this to an include file */

8
extensions/wallet/src/wallet.h
View File

@ -45,7 +45,7 @@ XP_BEGIN_PROTOS
static const char *pref_Crypto = "wallet.crypto";
extern void
WLLT_ChangePassword();
WLLT_ChangePassword(PRBool* status);
extern void
WLLT_DeleteAll();
@ -60,10 +60,10 @@ extern void
WLLT_PrefillReturn(const nsString& results);
extern void
WLLT_RequestToCapture(nsIPresShell* shell);
WLLT_RequestToCapture(nsIPresShell* shell, PRUint32* status);
extern nsresult
WLLT_Prefill(nsIPresShell* shell, PRBool quick);
WLLT_Prefill(nsIPresShell* shell, PRBool quick, PRBool* doPrefillMessage);
extern void
WLLT_GetNopreviewListForViewer(nsString& aNopreviewList);
@ -81,7 +81,7 @@ extern void
WLLT_FetchFromNetCenter();
extern void
WLLT_ExpirePassword();
WLLT_ExpirePassword(PRBool* status);
extern void
WLLT_InitReencryptCallback();

2
webshell/tests/viewer/nsBrowserWindow.cpp
View File

@ -982,7 +982,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
(nsISupports **)&walletservice);
if ((NS_OK == res) && (nsnull != walletservice)) {
nsString urlString2;
res = walletservice->WALLET_Prefill(shell, (PRVCY_QPREFILL == aID));
// res = walletservice->WALLET_Prefill(shell, (PRVCY_QPREFILL == aID));
NS_RELEASE(walletservice);
}

8
xpfe/browser/public/nsIBrowserInstance.idl
View File

@ -47,11 +47,11 @@ interface nsIBrowserInstance : nsISupports {
void updateGoMenu(in nsIDOMNode goMenu);
// Wallet (should reside elsewhere, somehow).
void walletPreview(in nsIDOMWindow win, in nsIDOMWindow form);
boolean walletPreview(in nsIDOMWindow win, in nsIDOMWindow form);
void walletChangePassword();
void walletQuickFillin(in nsIDOMWindow win);
void walletRequestToCapture(in nsIDOMWindow win);
boolean walletChangePassword();
boolean walletQuickFillin(in nsIDOMWindow win);
PRUint32 walletRequestToCapture(in nsIDOMWindow win);
// Infrastructure.

16
xpfe/browser/src/nsBrowserInstance.cpp
View File

@ -809,7 +809,7 @@ nsBrowserInstance::GotoHistoryIndex(PRInt32 aIndex)
}
NS_IMETHODIMP
nsBrowserInstance::WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm)
nsBrowserInstance::WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm, PRBool* doPrefillMessage)
{
NS_PRECONDITION(aForm != nsnull, "null ptr");
if (! aForm)
@ -828,7 +828,7 @@ nsBrowserInstance::WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm)
kIWalletServiceIID,
(nsISupports **)&walletservice);
if (NS_SUCCEEDED(res) && (nsnull != walletservice)) {
res = walletservice->WALLET_Prefill(presShell, PR_FALSE);
res = walletservice->WALLET_Prefill(presShell, PR_FALSE, doPrefillMessage);
nsServiceManager::ReleaseService(kWalletServiceCID, walletservice);
if (NS_FAILED(res)) { /* this just means that there was nothing to prefill */
return NS_OK;
@ -863,7 +863,7 @@ nsBrowserInstance::WalletPreview(nsIDOMWindow* aWin, nsIDOMWindow* aForm)
}
NS_IMETHODIMP
nsBrowserInstance::WalletChangePassword()
nsBrowserInstance::WalletChangePassword(PRBool* status)
{
nsIWalletService *walletservice;
nsresult res;
@ -871,7 +871,7 @@ nsBrowserInstance::WalletChangePassword()
kIWalletServiceIID,
(nsISupports **)&walletservice);
if ((NS_OK == res) && (nsnull != walletservice)) {
res = walletservice->WALLET_ChangePassword();
res = walletservice->WALLET_ChangePassword(status);
nsServiceManager::ReleaseService(kWalletServiceCID, walletservice);
}
return NS_OK;
@ -880,7 +880,7 @@ nsBrowserInstance::WalletChangePassword()
#include "nsIDOMHTMLDocument.h"
static NS_DEFINE_IID(kIDOMHTMLDocumentIID, NS_IDOMHTMLDOCUMENT_IID);
NS_IMETHODIMP
nsBrowserInstance::WalletQuickFillin(nsIDOMWindow* aWin)
nsBrowserInstance::WalletQuickFillin(nsIDOMWindow* aWin, PRBool* doPrefillMessage)
{
NS_PRECONDITION(aWin != nsnull, "null ptr");
if (! aWin)
@ -900,7 +900,7 @@ nsBrowserInstance::WalletQuickFillin(nsIDOMWindow* aWin)
kIWalletServiceIID,
(nsISupports **)&walletservice);
if ((NS_OK == res) && (nsnull != walletservice)) {
res = walletservice->WALLET_Prefill(presShell, PR_TRUE);
res = walletservice->WALLET_Prefill(presShell, PR_TRUE, doPrefillMessage);
nsServiceManager::ReleaseService(kWalletServiceCID, walletservice);
return NS_OK;
} else {
@ -909,7 +909,7 @@ nsBrowserInstance::WalletQuickFillin(nsIDOMWindow* aWin)
}
NS_IMETHODIMP
nsBrowserInstance::WalletRequestToCapture(nsIDOMWindow* aWin)
nsBrowserInstance::WalletRequestToCapture(nsIDOMWindow* aWin, PRUint32* status)
{
NS_PRECONDITION(aWin != nsnull, "null ptr");
if (! aWin)
@ -929,7 +929,7 @@ nsBrowserInstance::WalletRequestToCapture(nsIDOMWindow* aWin)
kIWalletServiceIID,
(nsISupports **)&walletservice);
if ((NS_OK == res) && (nsnull != walletservice)) {
res = walletservice->WALLET_RequestToCapture(presShell);
res = walletservice->WALLET_RequestToCapture(presShell, status);
nsServiceManager::ReleaseService(kWalletServiceCID, walletservice);
return NS_OK;
} else {

32
xpfe/communicator/resources/content/tasksOverlay.js
View File

@ -273,17 +273,26 @@ function CheckForWalletAndImage()
// perform a wallet action
function WalletAction( action )
{
var strings = document.getElementById("strings");
if (action == "password" || action == "expire" || action == "clear") {
wallet = Components.classes['component://netscape/wallet/wallet-service'];
wallet = wallet.getService();
wallet = wallet.QueryInterface(Components.interfaces.nsIWalletService);
if (action == "password") {
wallet.WALLET_ChangePassword();
if (!wallet.WALLET_ChangePassword()) {
window.alert(strings.getAttribute("PasswordNotChanged"));
}
} else if (action == "expire") {
wallet.WALLET_ExpirePassword();
if (wallet.WALLET_ExpirePassword()) {
window.alert(strings.getAttribute("PasswordExpired"));
} else {
window.alert(strings.getAttribute("PasswordNotExpired"));
}
} else if (action == "clear") {
wallet.WALLET_DeleteAll();
if (window.confirm(strings.getAttribute("AllDataWillBeCleared"))) {
wallet.WALLET_DeleteAll();
}
}
return;
}
@ -331,17 +340,28 @@ function WalletAction( action )
if( appCore ) {
switch( action ) {
case "safefill":
appCore.walletPreview(window, window._content);
if (appCore.walletPreview(window, window._content)) {
window.alert(strings.getAttribute("noPrefills"));
}
break;
// case "password":
// appCore.walletChangePassword();
// break;
case "quickfill":
appCore.walletQuickFillin(window._content);
if (appCore.walletQuickFillin(window._content)) {
window.alert(strings.getAttribute("noPrefills"));
}
break;
case "capture":
default:
appCore.walletRequestToCapture(window._content);
status = appCore.walletRequestToCapture(window._content);
if (status == -1) { /* UnableToCapture */
window.alert(strings.getAttribute("UnableToCapture"));
} else if (status == 0) { /* Captured */
window.alert(strings.getAttribute("Captured"));
} else if (status == +1) { /* NotCaptured */
window.alert(strings.getAttribute("NotCaptured"));
}
break;
}
}

11
xpfe/communicator/resources/content/tasksOverlay.xul
View File

@ -38,7 +38,16 @@
<menuseparator/>
<menu value="&walletMenu.label;">
<menupopup id="personalManagers" oncreate="CheckForWalletAndImage()">
<menupopup id="strings"
PasswordNotChanged = "&PasswordNotChanged;"
PasswordExpired = "&PasswordExpired;"
PasswordNotExpired = "&PasswordNotExpired;"
AllDataWillBeCleared = "&AllDataWillBeCleared;"
UnableToCapture = "&UnableToCapture;"
Captured = "&Captured;"
NotCaptured = "&NotCaptured;"
noPrefills = "&noPrefills;"
oncreate="CheckForWalletAndImage()">
<menu value="&walletPasswordManager.label;">
<menupopup>
<menuitem value="&walletDisplaySignonsCmd.label;" oncommand="WalletDialog('signon');"/>

8
xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
View File

@ -52,3 +52,11 @@
<!ENTITY taskAddressBook.tooltip "Address Book">
<!ENTITY taskBar.tooltip "Taskbar">
<!ENTITY PasswordNotChanged "Unable to change the password that protects your sensitive information.">
<!ENTITY PasswordExpired "Your sensitive information is now locked.">
<!ENTITY PasswordNotExpired "Unable to lock your sensitive information.">
<!ENTITY AllDataWillBeCleared "All stored data will be erased.">
<!ENTITY UnableToCapture "Unable to capture data.">
<!ENTITY Captured "Data has been captured.">
<!ENTITY NotCaptured "There is nothing to capture.">
<!ENTITY noPrefills "There are no fields that can be prefilled.">