Bug 1481915 - Do not allow converting Local Folders to maildir if the needed pref isn't set. r=mkmelin

This commit is contained in:
aceman 2018-11-18 15:52:00 +01:00
Родитель 9fe7caa009
Коммит a6d116d74b
1 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -5,7 +5,7 @@
ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm"); ChromeUtils.import("resource://gre/modules/BrowserUtils.jsm");
var gAccount; var gServer;
var gOriginalStoreType; var gOriginalStoreType;
/** /**
@ -23,8 +23,7 @@ function clickStoreTypeMenu(aStoreTypeElement) {
let response = { newRootFolder: null }; let response = { newRootFolder: null };
// Send 'response' as an argument to converterDialog.xhtml. // Send 'response' as an argument to converterDialog.xhtml.
window.openDialog("converterDialog.xhtml","mailnews:mailstoreconverter", window.openDialog("converterDialog.xhtml","mailnews:mailstoreconverter",
"modal,centerscreen,width=800,height=180", "modal,centerscreen,width=800,height=180", gServer,
gAccount.incomingServer,
aStoreTypeElement.value, response); aStoreTypeElement.value, response);
changeStoreType(response); changeStoreType(response);
} }
@ -53,7 +52,6 @@ function changeStoreType(aResponse) {
} }
function onInit(aPageId, aServerId) { function onInit(aPageId, aServerId) {
// UI for account store type // UI for account store type
let storeTypeElement = document.getElementById("server.storeTypeMenulist"); let storeTypeElement = document.getElementById("server.storeTypeMenulist");
// set the menuitem to match the account // set the menuitem to match the account
@ -61,12 +59,16 @@ function onInit(aPageId, aServerId) {
.getAttribute("value"); .getAttribute("value");
let targetItem = storeTypeElement.getElementsByAttribute("value", currentStoreID); let targetItem = storeTypeElement.getElementsByAttribute("value", currentStoreID);
storeTypeElement.selectedItem = targetItem[0]; storeTypeElement.selectedItem = targetItem[0];
// Disable store type change if store has not been used yet.
storeTypeElement.setAttribute("disabled",
gServer.getBoolValue("canChangeStoreType") ?
"false" : !Services.prefs.getBoolPref("mail.store_conversion_enabled"));
// Initialise 'gOriginalStoreType' to the item that was originally selected. // Initialise 'gOriginalStoreType' to the item that was originally selected.
gOriginalStoreType = storeTypeElement.value; gOriginalStoreType = storeTypeElement.value;
} }
function onPreInit(account, accountValues) { function onPreInit(account, accountValues) {
gAccount = account; gServer = account.incomingServer;
} }
function onSave() function onSave()