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

fix for #138253. don't do window.confirm() from chrome in addressbook.js.

Browse Source 
r=hewitt, sr=bienvenu


git-svn-id: svn://10.0.0.236/trunk@119310 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com
2002-04-18 21:55:40 +00:00
parent 314b3e62d6
commit d3edf408d5
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/mailnews/addrbook/resources/content/addressbook.js
View File

@@ -409,6 +409,8 @@ function AbDeleteDirectory()
if (!parentArray)
return;
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
// check to see if personal or collected address books is selected for deletion.
// if yes, prompt the user an appropriate message saying these cannot be deleted
if ((selectedABURI != kCollectedAddressbookURI) &&
@@ -424,12 +426,9 @@ function AbDeleteDirectory()
parentArray.AppendElement(parentDir);
}
else {
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
if (promptService) {
promptService.alert(window,
promptService.alert(window,
gAddressBookBundle.getString("cannotDeleteTitle"),
gAddressBookBundle.getString("cannotDeleteMessage"));
}
return;
}
@@ -441,7 +440,7 @@ function AbDeleteDirectory()
else
confirmDeleteMessage = gAddressBookBundle.getString("confirmDeleteAddressbook");
if (!window.confirm(confirmDeleteMessage))
if (!promptService.confirm(window, null, confirmDeleteMessage))
return;
var resourceArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray);