зеркало из https://github.com/mozilla/pjs.git
Bug 262892 In mail3PaneWindowCommands.js, 'Warning: redeclaration of var parentResource' (Bv1-TB) p=Serge Gautherie <sgautherie.bz@free.fr>,r=bryner,sr=mscott
This commit is contained in:
Родитель
cb145f2948
Коммит
fa4657e02a
|
@ -923,12 +923,14 @@ function MsgDeleteFolder()
|
||||||
var specialFolder = GetFolderAttribute(folderTree, folderResource, "SpecialFolder");
|
var specialFolder = GetFolderAttribute(folderTree, folderResource, "SpecialFolder");
|
||||||
if (specialFolder != "Inbox" && specialFolder != "Trash")
|
if (specialFolder != "Inbox" && specialFolder != "Trash")
|
||||||
{
|
{
|
||||||
|
var parentResource;
|
||||||
|
|
||||||
var folder = selectedFolder.QueryInterface(Components.interfaces.nsIMsgFolder);
|
var folder = selectedFolder.QueryInterface(Components.interfaces.nsIMsgFolder);
|
||||||
if (folder.flags & MSG_FOLDER_FLAG_VIRTUAL)
|
if (folder.flags & MSG_FOLDER_FLAG_VIRTUAL)
|
||||||
{
|
{
|
||||||
if (gCurrentVirtualFolderUri == folderResource.Value)
|
if (gCurrentVirtualFolderUri == folderResource.Value)
|
||||||
gCurrentVirtualFolderUri = null;
|
gCurrentVirtualFolderUri = null;
|
||||||
var parentResource = selectedFolder.parent.QueryInterface(Components.interfaces.nsIRDFResource);
|
parentResource = selectedFolder.parent.QueryInterface(Components.interfaces.nsIRDFResource);
|
||||||
messenger.DeleteFolders(GetFolderDatasource(), parentResource, folderResource);
|
messenger.DeleteFolders(GetFolderDatasource(), parentResource, folderResource);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -955,7 +957,7 @@ function MsgDeleteFolder()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var parentResource = selectedFolder.parent.QueryInterface(Components.interfaces.nsIRDFResource);
|
parentResource = selectedFolder.parent.QueryInterface(Components.interfaces.nsIRDFResource);
|
||||||
messenger.DeleteFolders(GetFolderDatasource(), parentResource, folderResource);
|
messenger.DeleteFolders(GetFolderDatasource(), parentResource, folderResource);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче