mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix goofed recent change from use of commondialogs to promptservice. bug 75244 r=hyatt,ianh

This commit is contained in:
danm%netscape.com 2001-04-09 20:38:20 +00:00
Родитель 010408bd12
Коммит bfe4893c0c
19 изменённых файлов: 30 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
editor/ui/composer/content/ComposerCommands.js
Просмотреть файл

@ -386,7 +386,7 @@ var nsRevertCommand =
var msg = window.editorShell.GetString("AbandonChanges").replace(/%title%/,title);
promptService.UniversalDialog(
promptService.universalDialog(
window,
null,
window.editorShell.GetString("RevertCaption"),

2
editor/ui/composer/content/editor.js
Просмотреть файл

@ -393,7 +393,7 @@ function CheckAndSaveDocument(reasonToSave, allowDontSave)
dialogMsg = (dialogMsg.replace(/%title%/,title)).replace(/%reason%/,reasonToSave);
var result = {value:0};
promptService.UniversalDialog(
promptService.universalDialog(
window,
null,
dialogTitle,

2
extensions/wallet/editor/WalletEditor.js
Просмотреть файл

@ -595,7 +595,7 @@ function myPrompt(message, oldValue, title) {
}
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
promptService.Prompt(window, title, message, "", 0, oldValue, newValue)
promptService.prompt(window, title, message, "", 0, oldValue, newValue)
return newValue.value;
}

2
mailnews/addrbook/resources/content/addressbook.js
Просмотреть файл

@ -288,7 +288,7 @@ function AbDeleteDirectory()
{
if (promptService)
{
promptService.Alert(window,
promptService.alert(window,
gAddressBookBundle.getString("cannotDeleteTitle"),
gAddressBookBundle.getString("cannotDeleteMessage"));
}

2
mailnews/base/prefs/resources/content/AccountWizard.js
Просмотреть файл

@ -172,7 +172,7 @@ function onCancel()
if (!(accountCount > 0)) {
var confirmTitle = gPrefsBundle.getString("accountWizard");
var confirmMsg = gPrefsBundle.getString("cancelWizard");
if (promptService.Confirm(window,confirmTitle,confirmMsg))
if (promptService.confirm(window,confirmTitle,confirmMsg))
window.close();
else
return;

4
mailnews/base/resources/content/mailWindowOverlay.js
Просмотреть файл

@ -661,8 +661,8 @@ function ConfirmUnsubscribe(folder)
var dialogMsg = gMessengerBundle.getFormattedString("confirmUnsubscribeText",
[folder.name], 1);
var promptService = nsJSComponentManager.getService("@mozilla.org/embedcomp/prompt-service;1", "nsIPromptService");
return promptService.Confirm(window, titleMsg, dialogMsg);
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
return promptService.confirm(window, titleMsg, dialogMsg);
}
function MsgUnsubscribe()

2
mailnews/base/resources/content/msgViewNavigation.js
Просмотреть файл

@ -150,7 +150,7 @@ function CrossFolderNavigation(type, supportsFolderPane )
case 1:
default:
var promptText = gMessengerBundle.getFormattedString("advanceNextPrompt", [ nextFolder.name ], 1);
if (promptService.Confirm(window, promptText, promptText)) {
if (promptService.confirm(window, promptText, promptText)) {
gNextMessageAfterLoad = type;
if (supportsFolderPane)
SelectFolder(nextFolderURI);

2
mailnews/base/search/resources/content/FilterEditor.js
Просмотреть файл

@ -73,7 +73,7 @@ function onOk()
if (promptService)
{
promptService.Alert(window,
promptService.alert(window,
gFilterBundle.getString("cannotHaveDuplicateFilterTitle"),
gFilterBundle.getString("cannotHaveDuplicateFilterMessage")
);

2
mailnews/base/search/resources/content/FilterListDialog.js
Просмотреть файл

@ -35,7 +35,7 @@ function onLoad()
rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
var gPromptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
gPromptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
gPromptService = gPromptService.QueryInterface(Components.interfaces.nsIPromptService);
gFilterBundle = document.getElementById("bundle_filter");

4
mailnews/compose/prefs/resources/content/pref-formatting.js
Просмотреть файл

@ -73,7 +73,7 @@ function AddDomain(obj)
if (promptService)
{
var result = {value:0};
if (promptService.Prompt(
if (promptService.prompt(
window,
obj.DlgTitle,
obj.DlgMsg,
@ -145,7 +145,7 @@ function DomainAlreadyPresent(obj, domain_name, dup)
errorMsg = document.getElementById("domainerrdlg").getAttribute("dualerr");
var errorMessage = errorMsg.replace(/@string@/, domain_name);
if (promptService)
promptService.Alert(window, errorTitle, errorMessage);
promptService.alert(window, errorTitle, errorMessage);
else
window.alert(errorMessage);
found = true;

14
mailnews/compose/resources/content/MsgComposeCommands.js
Просмотреть файл

@ -851,7 +851,7 @@ function ComposeLoad()
var errorMsg = gComposeMsgsBundle.getString("initErrorDlogMessage");
errorMsg = errorMsg.replace(/%1\$s/, ex);
if (promptService)
promptService.Alert(window, errorTitle, errorMsg);
promptService.alert(window, errorTitle, errorMsg);
else
window.alert(errorMsg);
@ -1045,7 +1045,7 @@ function GenericSendMessage( msgType )
if (promptService)
{
var result = {value:0};
if (promptService.Prompt(
if (promptService.prompt(
window,
gComposeMsgsBundle.getString("subjectDlogTitle"),
gComposeMsgsBundle.getString("subjectDlogMessage"),
@ -1405,7 +1405,7 @@ function ComposeCanClose()
if (promptService)
{
var result = {value:0};
promptService.UniversalDialog(
promptService.universalDialog(
window,
null,
gComposeMsgsBundle.getString("saveDlogTitle"),
@ -1482,7 +1482,7 @@ function AttachFile()
var errorMsg = gComposeMsgsBundle.getString("DuplicateFileErrorDlogMessage");
if (promptService)
promptService.Alert(window, errorTitle, errorMsg);
promptService.alert(window, errorTitle, errorMsg);
else
window.alert(errorMsg);
}
@ -1518,7 +1518,7 @@ function AttachPage()
if (promptService)
{
var result = {value:0};
if (promptService.Prompt(
if (promptService.prompt(
window,
gComposeMsgsBundle.getString("attachPageDlogTitle"),
gComposeMsgsBundle.getString("attachPageDlogMessage"),
@ -1840,7 +1840,7 @@ var attachmentBucketObserver = {
var errorMsg = gComposeMsgsBundle.getString("DuplicateFileErrorDlogMessage");
if (promptService)
promptService.Alert(window, errorTitle, errorMsg);
promptService.alert(window, errorTitle, errorMsg);
else
window.alert(errorMsg);
}
@ -1903,7 +1903,7 @@ function DisplaySaveFolderDlg(folderURI)
var SaveDlgMsg = newMessage.replace(/@HostName@/, msgfolder.hostname);
if (promptService)
promptService.AlertCheck(window, SaveDlgTitle, SaveDlgMsg, CheckMsg, checkbox);
promptService.alertCheck(window, SaveDlgTitle, SaveDlgMsg, CheckMsg, checkbox);
else
window.alert(SaveDlgMsg);
try {

2
xpfe/browser/resources/content/navigatorDD.js
Просмотреть файл

@ -310,7 +310,7 @@ var homeButtonObserver = {
var okButton = gNavigatorBundle.getString("droponhomeokbutton");
var iconURL = "chrome://navigator/skin/home.gif"; // evil evil common dialog code! evil!
promptService.UniversalDialog(window, null, promptTitle, promptMsg, null,
promptService.universalDialog(window, null, promptTitle, promptMsg, null,
okButton, null, null, null, null, null, { }, { },
iconURL, { }, 2, 0, null, pressedVal);

2
xpfe/communicator/resources/content/contentAreaClick.js
Просмотреть файл

@ -80,7 +80,7 @@
var title = " ";
var message = "";
var ok =
promptService.Select
promptService.select
(window, title, message, valueList.length, valueList, position)
if (ok) {
target.value = valueList[position.value];

2
xpfe/components/filepicker/res/content/filepicker.js
Просмотреть файл

@ -298,7 +298,7 @@ function onOK()
[oldParent.unicodePath, file.unicodePath]);
}
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
promptService.Alert(window, errorTitle, errorMessage);
promptService.alert(window, errorTitle, errorMessage);
ret = nsIFilePicker.returnCancel;
}
}

2
xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
Просмотреть файл

@ -158,7 +158,7 @@
var dialogMsg = gPrefApplicationsBundle.getString("handlerExists");
dialogMsg = dialogMsg.replace(/%mime%/g, gMIMEField.value);
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
var replace = promptService.Confirm(window, titleMsg, dialogMsg);
var replace = promptService.confirm(window, titleMsg, dialogMsg);
if (!replace)
window.close();

2
xpfe/components/prefwindow/resources/content/pref-applications-new.js
Просмотреть файл

@ -65,7 +65,7 @@ function onOK()
var dialogMsg = gPrefApplicationsBundle.getString("handlerExists");
dialogMsg = dialogMsg.replace(/%mime%/g, gMIMEField.value);
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
var replace = promptService.Confirm(window, titleMsg, dialogMsg);
var replace = promptService.confirm(window, titleMsg, dialogMsg);
if (!replace)
window.close();
}

2
xpfe/components/prefwindow/resources/content/pref-applications.js
Просмотреть файл

@ -27,7 +27,7 @@ function removeType()
var dialogMsg = gPrefApplicationsBundle.getString("removeHandler");
dialogMsg = dialogMsg.replace(/%n/g, "\n");
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
var remove = promptService.Confirm(window, titleMsg, dialogMsg);
var remove = promptService.confirm(window, titleMsg, dialogMsg);
if (remove) {
var uri = gTree.selectedItems[0].id;
var handlerOverride = new HandlerOverride(uri);

4
xpfe/components/search/resources/search-editor.js
Просмотреть файл

@ -447,7 +447,7 @@ function NewCategory()
var promptStr = bundle.GetStringFromName("NewCategoryPrompt");
var newTitle = bundle.GetStringFromName("NewCategoryTitle");
var result = {value:0};
var name = promptService.Prompt(window, newTitle, promptStr, "", 0, "",result);
var name = promptService.prompt(window, newTitle, promptStr, "", 0, "",result);
if ((!result.value) || result.value == "") return(false);
var newName = RDF.GetLiteral(result.value);
@ -499,7 +499,7 @@ function RenameCategory()
var promptStr = bundle.GetStringFromName("RenameCategoryPrompt");
var renameTitle = bundle.GetStringFromName("RenameCategoryTitle");
var result = {value:0};
var name = promptService.Prompt(window,renameTitle,promptStr,"",0,currentName,result);
var name = promptService.prompt(window,renameTitle,promptStr,"",0,currentName,result);
if ((!result.value) || (result.value == "") || result.value == currentName) return(false);
var currentCatID = categoryList.selectedItem.getAttribute("id");

6
xpfe/components/sidebar/src/nsSidebar.js
Просмотреть файл

@ -145,7 +145,7 @@ function (aTitle, aContentURL, aCustomizeURL)
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
if (promptService) {
promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
promptService.Alert(this.window, titleMessage, dialogMessage);
promptService.alert(this.window, titleMessage, dialogMessage);
}
return;
@ -169,7 +169,7 @@ function (aTitle, aContentURL, aCustomizeURL)
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
var rv = promptService.Confirm(this.window, titleMessage, dialogMessage);
var rv = promptService.confirm(this.window, titleMessage, dialogMessage);
if (!rv)
return;
@ -277,7 +277,7 @@ function (engineURL, iconURL, suggestedTitle, suggestedCategory)
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
var rv = promptService.Confirm(this.window, titleMessage, dialogMessage);
var rv = promptService.confirm(this.window, titleMessage, dialogMessage);
if (!rv)
return;