зеркало из https://github.com/mozilla/pjs.git
Bug #294094 --> follow up cleanup to the new filter action ui
Make pre-fill filters work again. Make sure the target folder can file messages when saving a filter r=neil sr=bienveu a=me
This commit is contained in:
Родитель
de82ee61b3
Коммит
202262558c
|
@ -114,8 +114,6 @@ function filterEditorOnLoad()
|
|||
filterAction.type = (getScopeFromFilterList(gFilterList) == Components.interfaces.nsMsgSearchScope.newsFilter) ? nsMsgFilterAction.Delete : nsMsgFilterAction.MoveToFolder;
|
||||
gFilter.appendAction(filterAction);
|
||||
initializeDialog(gFilter);
|
||||
// Clear the default action added above now that the dialog is initialized.
|
||||
gFilter.clearActionList();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -321,10 +319,9 @@ function saveFilter()
|
|||
gFilter.enabled=true;
|
||||
}
|
||||
else
|
||||
{
|
||||
isNewFilter = false;
|
||||
gFilter.clearActionList();
|
||||
}
|
||||
|
||||
gFilter.clearActionList();
|
||||
}
|
||||
|
||||
// add each filteraction to the filter
|
||||
|
|
|
@ -279,7 +279,8 @@
|
|||
{
|
||||
case "movemessage":
|
||||
case "copymessage":
|
||||
if (!actionTarget.uri || actionTarget.uri == "")
|
||||
var msgFolder = actionTarget.uri ? GetMsgFolderFromUri(actionTarget.uri) : null;
|
||||
if (!msgFolder || !msgFolder.canFileMessages)
|
||||
errorString = "mustSelectFolder";
|
||||
break;
|
||||
case "forwardmessage":
|
||||
|
|
Загрузка…
Ссылка в новой задаче