From d3edf408d587c6e7326a3c5875ca6780e66fd586 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Thu, 18 Apr 2002 21:55:40 +0000 Subject: [PATCH] fix for #138253. don't do window.confirm() from chrome in addressbook.js. r=hewitt, sr=bienvenu git-svn-id: svn://10.0.0.236/trunk@119310 18797224-902f-48f8-a5cc-f745e15eee43 --- .../mailnews/addrbook/resources/content/addressbook.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.js b/mozilla/mailnews/addrbook/resources/content/addressbook.js index 0e0f7d2d237..49bfde6cbfb 100644 --- a/mozilla/mailnews/addrbook/resources/content/addressbook.js +++ b/mozilla/mailnews/addrbook/resources/content/addressbook.js @@ -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);