105328 r/sr=sspitzer. Throw duplicate folder alert when trying to create new folder from filter
editor. git-svn-id: svn://10.0.0.236/trunk@105753 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
1173c75ca5
commit
3006157fc5
@ -52,7 +52,8 @@ var gFilterBundle;
|
||||
var nsMsgSearchScope = Components.interfaces.nsMsgSearchScope;
|
||||
|
||||
var nsMsgFilterAction = Components.interfaces.nsMsgFilterAction;
|
||||
|
||||
var gFilterEditorMsgWindow=null;
|
||||
|
||||
function filterEditorOnLoad()
|
||||
{
|
||||
initializeSearchWidgets();
|
||||
@ -295,7 +296,8 @@ function GetFirstSelectedMsgFolder()
|
||||
function SearchNewFolderOkCallback(name,uri)
|
||||
{
|
||||
var msgFolder = GetMsgFolderFromUri(uri);
|
||||
msgFolder.createSubfolder(name, null);
|
||||
var msgWindow = GetFilterEditorMsgWindow();
|
||||
msgFolder.createSubfolder(name, msgWindow);
|
||||
|
||||
var curFolder = uri+"/"+name;
|
||||
SetFolderPicker(curFolder, gActionTargetElement.id);
|
||||
@ -305,3 +307,15 @@ function UpdateAfterCustomHeaderChange()
|
||||
{
|
||||
updateSearchAttributes();
|
||||
}
|
||||
//if you use msgWindow, please make sure that destructor gets called when you close the "window"
|
||||
function GetFilterEditorMsgWindow()
|
||||
{
|
||||
if (!gFilterEditorMsgWindow)
|
||||
{
|
||||
var msgWindowContractID = "@mozilla.org/messenger/msgwindow;1";
|
||||
var nsIMsgWindow = Components.interfaces.nsIMsgWindow;
|
||||
gFilterEditorMsgWindow = Components.classes[msgWindowContractID].createInstance(nsIMsgWindow);
|
||||
gFilterEditorMsgWindow.SetDOMWindow(window);
|
||||
}
|
||||
return gFilterEditorMsgWindow;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user