зеркало из https://github.com/mozilla/gecko-dev.git
clean up - get rid of FindMessenger() & SetWindow() calls; fixed Move/CopyMesseages not working for POP3 mail folders; implemented Close() & OnUnload() method
This commit is contained in:
Родитель
723d21af2c
Коммит
149d5de6f8
|
@ -1,8 +1,6 @@
|
|||
var messenger = Components.classes['component://netscape/messenger'].createInstance();
|
||||
messenger = messenger.QueryInterface(Components.interfaces.nsIMessenger);
|
||||
|
||||
var composeAppCore;
|
||||
|
||||
var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService();
|
||||
RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
|
||||
|
||||
|
@ -21,11 +19,7 @@ function FindMessenger()
|
|||
function OpenURL(url)
|
||||
{
|
||||
dump("\n\nOpenURL from XUL\n\n\n");
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
appCore.OpenURL(url);
|
||||
}
|
||||
messenger.OpenURL(url);
|
||||
}
|
||||
|
||||
function ComposeMessage(tree, nodeList, messenger, type)
|
||||
|
@ -68,12 +62,7 @@ function GetNewMessages()
|
|||
if(selectedFolderList.length > 0)
|
||||
{
|
||||
var selectedFolder = selectedFolderList[0];
|
||||
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
appCore.GetNewMessages(folderTree.database, selectedFolder);
|
||||
}
|
||||
messenger.GetNewMessages(folderTree.database, selectedFolder);
|
||||
}
|
||||
else {
|
||||
dump("Nothing was selected\n");
|
||||
|
@ -82,11 +71,8 @@ function GetNewMessages()
|
|||
|
||||
function MsgAccountManager()
|
||||
{
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
dump('Opening account manager..\n');
|
||||
appCore.AccountManager(window);
|
||||
}
|
||||
messenger.AccountManager(window);
|
||||
}
|
||||
|
||||
function MsgSubscribe()
|
||||
|
@ -121,13 +107,10 @@ function ComposeMessageWithType(type)
|
|||
if(tree) {
|
||||
dump("tree is valid\n");
|
||||
var nodeList = tree.getElementsByAttribute("selected", "true");
|
||||
var appCore = FindMessenger();
|
||||
dump("message type ");
|
||||
dump(type);
|
||||
dump("\n");
|
||||
if (appCore && nodeList)
|
||||
appCore.SetWindow(window);
|
||||
ComposeMessage(tree, nodeList, appCore, type);
|
||||
ComposeMessage(tree, nodeList, messenger, type);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
<!ENTITY pageSetupCmd.label ".Page Setup...">
|
||||
<!ENTITY printPreviewCmd.label ".Print Preview">
|
||||
<!ENTITY printCmd.label ".Print">
|
||||
<!ENTITY closeCmd.label ".Close">
|
||||
<!ENTITY closeCmd.label "Close">
|
||||
<!ENTITY exitCmd.label "Exit">
|
||||
<!ENTITY editMenu.label "Edit">
|
||||
<!ENTITY undoCmd.label ".Undo">
|
||||
|
@ -236,7 +236,9 @@
|
|||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&messengerWindow.title;"
|
||||
style="width:100%;height:100%">
|
||||
onload="OnLoad()"
|
||||
onunload="OnUnload()"
|
||||
style="width:100%;height:100%">
|
||||
|
||||
<html:script src="chrome://messenger/content/widgetglue.js"/>
|
||||
<html:script src="chrome://messenger/content/commandglue.js"/>
|
||||
|
|
|
@ -5,31 +5,39 @@ function WizardPage() {}
|
|||
function PageSetup() {}
|
||||
function PrintPreview() {}
|
||||
function Print() {}
|
||||
function Close() {}
|
||||
|
||||
function OnLoad()
|
||||
{
|
||||
messenger.SetWindow(window);
|
||||
}
|
||||
|
||||
function OnUnload()
|
||||
{
|
||||
dump("\nOnUnload from XUL\nClean up ...\n");
|
||||
messenger.OnUnload();
|
||||
}
|
||||
|
||||
function Close()
|
||||
{
|
||||
dump("\nClose from XUL\nDo something...\n");
|
||||
messenger.Close();
|
||||
}
|
||||
|
||||
function Exit()
|
||||
{
|
||||
dump("\nExit from XUL\n");
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
dump("\nAppcore isn't null in Exit\n");
|
||||
appCore.SetWindow(window);
|
||||
appCore.exit();
|
||||
}
|
||||
messenger.Exit();
|
||||
}
|
||||
|
||||
function CharacterSet(){}
|
||||
|
||||
function MessengerSetDefaultCharacterSet(aCharset)
|
||||
{
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
dump(aCharset);dump("\n");
|
||||
appCore.SetDocumentCharset(aCharset);
|
||||
messenger.SetDocumentCharset(aCharset);
|
||||
var folderResource = GetSelectedFolderResource();
|
||||
SetFolderCharset(folderResource, aCharset);
|
||||
MsgReload();
|
||||
} else {
|
||||
dump("Messenger has not been created!\n");
|
||||
}
|
||||
}
|
||||
|
||||
function NavigatorWindow()
|
||||
|
|
|
@ -1,19 +1,3 @@
|
|||
|
||||
function MsgStartUp()
|
||||
{
|
||||
dump("StartUp: Messenger\n");
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
dump("In MsgStartUp()");
|
||||
dump("Initializing AppCore and setting Window\n");
|
||||
appCore.SetWindow(window);
|
||||
ChangeFolderByURI("mailbox://Inbox");
|
||||
//In the future we'll want to read this in from a preference.
|
||||
MsgViewAllMsgs();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
function MsgLoadNewsMessage(url)
|
||||
{
|
||||
dump("\n\nMsgLoadNewsMessage from XUL\n");
|
||||
|
@ -49,47 +33,37 @@ function MsgDeleteMessage()
|
|||
{
|
||||
dump("\nMsgDeleteMessage from XUL\n");
|
||||
var tree = frames[0].frames[1].document.getElementById('threadTree');
|
||||
if(tree)
|
||||
if(tree) {
|
||||
dump("tree is valid\n");
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
dump("\nAppcore isn't null in MsgDeleteMessage\n");
|
||||
appCore.SetWindow(window);
|
||||
//get the selected elements
|
||||
var messageList = tree.getElementsByAttribute("selected", "true");
|
||||
//get the current folder
|
||||
var srcFolder = tree.childNodes[5];
|
||||
appCore.DeleteMessages(tree, srcFolder, messageList);
|
||||
messenger.DeleteMessages(tree, srcFolder, messageList);
|
||||
}
|
||||
}
|
||||
|
||||
function MsgDeleteFolder()
|
||||
{
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
//get the selected elements
|
||||
var tree = frames[0].frames[0].document.getElementById('folderTree');
|
||||
var folderList = tree.getElementsByAttribute("selected", "true");
|
||||
var i;
|
||||
var folder, parent;
|
||||
for(i = 0; i < folderList.length; i++)
|
||||
{
|
||||
folder = folderList[i];
|
||||
folderuri = folder.getAttribute('id');
|
||||
dump(folderuri);
|
||||
|
||||
parent = folder.parentNode.parentNode;
|
||||
var parenturi = parent.getAttribute('id');
|
||||
if(parenturi)
|
||||
dump(parenturi);
|
||||
else
|
||||
dump("No parenturi");
|
||||
dump("folder = " + folder.nodeName + "\n");
|
||||
dump("parent = " + parent.nodeName + "\n");
|
||||
|
||||
appCore.DeleteFolders(tree.database, parent, folder);
|
||||
}
|
||||
//get the selected elements
|
||||
var tree = frames[0].frames[0].document.getElementById('folderTree');
|
||||
var folderList = tree.getElementsByAttribute("selected", "true");
|
||||
var i;
|
||||
var folder, parent;
|
||||
for(i = 0; i < folderList.length; i++)
|
||||
{
|
||||
folder = folderList[i];
|
||||
folderuri = folder.getAttribute('id');
|
||||
dump(folderuri);
|
||||
parent = folder.parentNode.parentNode;
|
||||
var parenturi = parent.getAttribute('id');
|
||||
if(parenturi)
|
||||
dump(parenturi);
|
||||
else
|
||||
dump("No parenturi");
|
||||
dump("folder = " + folder.nodeName + "\n");
|
||||
dump("parent = " + parent.nodeName + "\n");
|
||||
messenger.DeleteFolders(tree.database, parent, folder);
|
||||
}
|
||||
|
||||
|
||||
|
@ -136,13 +110,9 @@ function MsgCopyMessage(destFolder)
|
|||
{
|
||||
//Get the selected messages to copy
|
||||
var messageList = tree.getElementsByAttribute("selected", "true");
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
//get the current folder
|
||||
var srcFolder = tree.childNodes[5];
|
||||
appCore.CopyMessages(srcFolder, destFolder, messageList);
|
||||
}
|
||||
//get the current folder
|
||||
var srcFolder = tree.childNodes[5];
|
||||
messenger.CopyMessages(srcFolder, destFolder, messageList, false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -157,13 +127,9 @@ function MsgMoveMessage(destFolder)
|
|||
{
|
||||
//Get the selected messages to copy
|
||||
var messageList = tree.getElementsByAttribute("selected", "true");
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
//get the current folder
|
||||
var srcFolder = tree.childNodes[5];
|
||||
appCore.MoveMessages(srcFolder, destFolder, messageList);
|
||||
}
|
||||
//get the current folder
|
||||
var srcFolder = tree.childNodes[5];
|
||||
messenger.CopyMessages(srcFolder, destFolder, messageList, true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -173,11 +139,7 @@ function MsgViewAllMsgs()
|
|||
|
||||
var tree = frames[0].frames[1].document.getElementById('threadTree');
|
||||
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
appCore.ViewAllMessages(tree.database);
|
||||
}
|
||||
messenger.ViewAllMessages(tree.database);
|
||||
|
||||
//hack to make it get new view.
|
||||
var currentFolder = tree.childNodes[5].getAttribute('id');
|
||||
|
@ -191,11 +153,7 @@ function MsgViewUnreadMsg()
|
|||
|
||||
var tree = frames[0].frames[1].document.getElementById('threadTree');
|
||||
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
appCore.ViewUnreadMessages(tree.database);
|
||||
}
|
||||
messenger.ViewUnreadMessages(tree.database);
|
||||
|
||||
//hack to make it get new view.
|
||||
var currentFolder = tree.childNodes[5].getAttribute('id');
|
||||
|
@ -210,11 +168,7 @@ function MsgViewAllThreadMsgs()
|
|||
|
||||
var tree = frames[0].frames[1].document.getElementById('threadTree');
|
||||
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
appCore.ViewAllThreadMessages(tree.database);
|
||||
}
|
||||
messenger.ViewAllThreadMessages(tree.database);
|
||||
|
||||
//hack to make it get new view.
|
||||
var currentFolder = tree.childNodes[5].getAttribute('id');
|
||||
|
@ -247,13 +201,8 @@ function MsgNewFolder()
|
|||
var selectedFolderList = folderTree.getElementsByAttribute("selected", "true");
|
||||
var selectedFolder = selectedFolderList[0];
|
||||
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
//Note this is temporary hardcoding until I can get this from a dialog
|
||||
appCore.NewFolder(folderTree.database, selectedFolder, "New Folder");
|
||||
}
|
||||
|
||||
//Note this is temporary hardcoding until I can get this from a dialog
|
||||
messenger.NewFolder(folderTree.database, selectedFolder, "New Folder");
|
||||
}
|
||||
|
||||
|
||||
|
@ -343,14 +292,9 @@ function MsgMarkMsgAsRead(markRead)
|
|||
{
|
||||
dump("\MsgMarkMsgAsRead from XUL\n");
|
||||
var tree = frames[0].frames[1].document.getElementById('threadTree');
|
||||
var appCore = FindMessenger();
|
||||
if (appCore != null) {
|
||||
appCore.SetWindow(window);
|
||||
//get the selected elements
|
||||
var messageList = tree.getElementsByAttribute("selected", "true");
|
||||
appCore.MarkMessagesRead(tree.database, messageList, markRead);
|
||||
}
|
||||
|
||||
//get the selected elements
|
||||
var messageList = tree.getElementsByAttribute("selected", "true");
|
||||
messenger.MarkMessagesRead(tree.database, messageList, markRead);
|
||||
}
|
||||
|
||||
function MsgMarkThreadAsRead() {}
|
||||
|
|
Загрузка…
Ссылка в новой задаче