Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove tabs and some trailing white space from thunderbird's xul and js files.

Browse Source 
purely white space changes.


git-svn-id: svn://10.0.0.236/trunk@235527 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org 2007-09-12 06:03:27 +00:00
parent af68983146
commit 90ded85a0c
28 changed files with 1787 additions and 1780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/mail/base/content/FilterListDialog.js
View File

@ -59,11 +59,11 @@ var gCurrentServerURI = null;
var gStatusFeedback = { var gStatusFeedback = {
progressMeterVisible : false, progressMeterVisible : false,
showStatusString: function(status) showStatusString: function(status)
{ {
gStatusText.setAttribute("value", status); gStatusText.setAttribute("value", status);
}, },
startMeteors: function() startMeteors: function()
{ {
// change run button to be a stop button // change run button to be a stop button
gRunFiltersButton.setAttribute("label", gRunFiltersButton.getAttribute("stoplabel")); gRunFiltersButton.setAttribute("label", gRunFiltersButton.getAttribute("stoplabel"));
@ -77,7 +77,7 @@ var gStatusFeedback = {
gStatusBar.setAttribute("mode", "undetermined"); gStatusBar.setAttribute("mode", "undetermined");
}, },
stopMeteors: function() stopMeteors: function()
{ {
try { try {
// change run button to be a stop button // change run button to be a stop button

2
mozilla/mail/base/content/customizeToolbar.xul
View File

@ -62,7 +62,7 @@
onload="onLoad();" onload="onLoad();"
onunload="onUnload();" onunload="onUnload();"
buttons="accept,cancel" buttons="accept,cancel"
ondialogaccept="return onAccept();" ondialogaccept="return onAccept();"
ondialogcancel="return onCancel();" ondialogcancel="return onCancel();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

34
mozilla/mail/base/content/hiddenWindow.js
View File

@ -40,25 +40,25 @@ function hiddenWindowStartup()
{ {
// Disable menus which are not appropriate // Disable menus which are not appropriate
var disabledItems = ['newNewMsgCmd', 'menu_newFolder', 'newAccountMenuItem', 'menu_close', 'menu_saveAs', var disabledItems = ['newNewMsgCmd', 'menu_newFolder', 'newAccountMenuItem', 'menu_close', 'menu_saveAs',
'menu_saveAsFile', 'menu_newVirtualFolder', 'menu_find', 'menu_findCmd', 'menu_findAgainCmd', 'menu_saveAsFile', 'menu_newVirtualFolder', 'menu_find', 'menu_findCmd', 'menu_findAgainCmd',
'menu_sendunsentmsgs', 'menu_subscribe', 'menu_renameFolder', 'menu_select', 'menu_sendunsentmsgs', 'menu_subscribe', 'menu_renameFolder', 'menu_select',
'menu_selectAll', 'menu_selectThread', 'menu_selectAll', 'menu_selectThread',
'menu_favoriteFolder', 'menu_properties', 'menu_favoriteFolder', 'menu_properties',
'menu_Toolbars', 'menu_MessagePaneLayout', 'menu_showMessage', 'menu_FolderViews', 'menu_Toolbars', 'menu_MessagePaneLayout', 'menu_showMessage', 'menu_FolderViews',
'viewSortMenu', 'groupBySort', 'viewMessageViewMenu', 'mailviewCharsetMenu', 'viewSortMenu', 'groupBySort', 'viewMessageViewMenu', 'mailviewCharsetMenu',
'viewMessagesMenu', 'menu_expandAllThreads', 'collapseAllThreads', 'viewMessagesMenu', 'menu_expandAllThreads', 'collapseAllThreads',
'viewheadersmenu', 'viewBodyMenu', 'viewAttachmentsInlineMenuitem', 'viewheadersmenu', 'viewBodyMenu', 'viewAttachmentsInlineMenuitem',
'viewTextSizeMenu', 'menu_textZoomEnlarge', 'menu_textZoomReduce', 'viewTextSizeMenu', 'menu_textZoomEnlarge', 'menu_textZoomReduce',
'goNextMenu', 'menu_nextMsg', 'menu_nextUnreadMsg', 'menu_nextUnreadThread', 'goNextMenu', 'menu_nextMsg', 'menu_nextUnreadMsg', 'menu_nextUnreadThread',
'goPreviousMenu', 'menu_prevMsg', 'menu_prevUnreadMsg', 'menu_goForward', 'menu_goBack', 'goPreviousMenu', 'menu_prevMsg', 'menu_prevUnreadMsg', 'menu_goForward', 'menu_goBack',
'goStartPage', 'newMsgCmd', 'replyMainMenu', 'replySenderMainMenu', 'replyNewsgroupMainMenu', 'goStartPage', 'newMsgCmd', 'replyMainMenu', 'replySenderMainMenu', 'replyNewsgroupMainMenu',
'menu_replyToAll', 'menu_forwardMsg', 'forwardAsMenu', 'menu_editMsgAsNew', 'openMessageWindowMenuitem', 'menu_replyToAll', 'menu_forwardMsg', 'forwardAsMenu', 'menu_editMsgAsNew', 'openMessageWindowMenuitem',
'moveMenu', 'copyMenu', 'moveToFolderAgain', 'tagMenu', 'markMenu', 'moveMenu', 'copyMenu', 'moveToFolderAgain', 'tagMenu', 'markMenu',
'markReadMenuItem', 'menu_markThreadAsRead', 'menu_markReadByDate', 'menu_markAllRead', 'markReadMenuItem', 'menu_markThreadAsRead', 'menu_markReadByDate', 'menu_markAllRead',
'markFlaggedMenuItem', 'menu_markAsJunk', 'menu_markAsNotJunk', 'createFilter', 'markFlaggedMenuItem', 'menu_markAsJunk', 'menu_markAsNotJunk', 'createFilter',
'killThread', 'watchThread', 'applyFilters', 'runJunkControls', 'deleteJunk', 'menu_import', 'killThread', 'watchThread', 'applyFilters', 'runJunkControls', 'deleteJunk', 'menu_import',
'searchMailCmd', 'searchAddressesCmd', 'filtersCmd', 'junkMailCmd', 'searchMailCmd', 'searchAddressesCmd', 'filtersCmd', 'junkMailCmd',
'cmd_close', 'minimizeWindow', 'zoomWindow']; 'cmd_close', 'minimizeWindow', 'zoomWindow'];
var id; var id;
var element; var element;
for (id in disabledItems) for (id in disabledItems)

584
mozilla/mail/base/content/mail3PaneWindowCommands.js
View File

@ -45,61 +45,61 @@ var gMessengerBundle = document.getElementById("bundle_messenger");
var FolderPaneController = var FolderPaneController =
{ {
supportsCommand: function(command) supportsCommand: function(command)
{ {
switch ( command ) switch ( command )
{ {
case "cmd_delete": case "cmd_delete":
case "button_delete": case "button_delete":
//case "cmd_selectAll": the folder pane currently only handles single selection //case "cmd_selectAll": the folder pane currently only handles single selection
case "cmd_cut": case "cmd_cut":
case "cmd_copy": case "cmd_copy":
case "cmd_paste": case "cmd_paste":
return true; return true;
default: default:
return false; return false;
} }
}, },
isCommandEnabled: function(command) isCommandEnabled: function(command)
{ {
if (IsFakeAccount()) if (IsFakeAccount())
return false; return false;
switch ( command ) switch ( command )
{ {
case "cmd_cut": case "cmd_cut":
case "cmd_copy": case "cmd_copy":
case "cmd_paste": case "cmd_paste":
return false; return false;
case "cmd_delete": case "cmd_delete":
case "button_delete": case "button_delete":
if ( command == "cmd_delete" ) if ( command == "cmd_delete" )
goSetMenuValue(command, 'valueFolder'); goSetMenuValue(command, 'valueFolder');
var folderTree = GetFolderTree(); var folderTree = GetFolderTree();
var startIndex = {}; var startIndex = {};
var endIndex = {}; var endIndex = {};
folderTree.view.selection.getRangeAt(0, startIndex, endIndex); folderTree.view.selection.getRangeAt(0, startIndex, endIndex);
if (startIndex.value >= 0) { if (startIndex.value >= 0) {
var canDeleteThisFolder; var canDeleteThisFolder;
var specialFolder = null; var specialFolder = null;
var isServer = null; var isServer = null;
var serverType = null; var serverType = null;
try { try {
var folderResource = GetFolderResource(folderTree, startIndex.value); var folderResource = GetFolderResource(folderTree, startIndex.value);
specialFolder = GetFolderAttribute(folderTree, folderResource, "SpecialFolder"); specialFolder = GetFolderAttribute(folderTree, folderResource, "SpecialFolder");
isServer = GetFolderAttribute(folderTree, folderResource, "IsServer"); isServer = GetFolderAttribute(folderTree, folderResource, "IsServer");
serverType = GetFolderAttribute(folderTree, folderResource, "ServerType"); serverType = GetFolderAttribute(folderTree, folderResource, "ServerType");
if (serverType == "nntp") { if (serverType == "nntp") {
if ( command == "cmd_delete" ) { if ( command == "cmd_delete" ) {
goSetMenuValue(command, 'valueNewsgroup'); goSetMenuValue(command, 'valueNewsgroup');
goSetAccessKey(command, 'valueNewsgroupAccessKey'); goSetAccessKey(command, 'valueNewsgroupAccessKey');
} }
} }
} }
catch (ex) { catch (ex) {
//dump("specialFolder failure: " + ex + "\n"); //dump("specialFolder failure: " + ex + "\n");
} }
if (specialFolder == "Inbox" || specialFolder == "Trash" || specialFolder == "Drafts" || if (specialFolder == "Inbox" || specialFolder == "Trash" || specialFolder == "Drafts" ||
specialFolder == "Sent" || specialFolder == "Templates" || specialFolder == "Unsent Messages" || specialFolder == "Sent" || specialFolder == "Templates" || specialFolder == "Unsent Messages" ||
(specialFolder == "Junk" && !CanRenameDeleteJunkMail(GetSelectedFolderURI())) || isServer == "true") (specialFolder == "Junk" && !CanRenameDeleteJunkMail(GetSelectedFolderURI())) || isServer == "true")
@ -108,127 +108,127 @@ var FolderPaneController =
canDeleteThisFolder = true; canDeleteThisFolder = true;
return canDeleteThisFolder && isCommandEnabled(command); return canDeleteThisFolder && isCommandEnabled(command);
} }
else else
return false; return false;
default: default:
return false; return false;
} }
}, },
doCommand: function(command) doCommand: function(command)
{ {
// if the user invoked a key short cut then it is possible that we got here for a command which is // if the user invoked a key short cut then it is possible that we got here for a command which is
// really disabled. kick out if the command should be disabled. // really disabled. kick out if the command should be disabled.
if (!this.isCommandEnabled(command)) return; if (!this.isCommandEnabled(command)) return;
switch ( command ) switch ( command )
{ {
case "cmd_delete": case "cmd_delete":
case "button_delete": case "button_delete":
MsgDeleteFolder(); MsgDeleteFolder();
break; break;
} }
}, },
onEvent: function(event) onEvent: function(event)
{ {
} }
}; };
// DefaultController object (handles commands when one of the trees does not have focus) // DefaultController object (handles commands when one of the trees does not have focus)
var DefaultController = var DefaultController =
{ {
supportsCommand: function(command) supportsCommand: function(command)
{ {
switch ( command ) switch ( command )
{ {
case "cmd_createFilterFromPopup": case "cmd_createFilterFromPopup":
case "cmd_close": case "cmd_close":
case "cmd_reply": case "cmd_reply":
case "button_reply": case "button_reply":
case "cmd_replySender": case "cmd_replySender":
case "cmd_replyGroup": case "cmd_replyGroup":
case "cmd_replyall": case "cmd_replyall":
case "button_replyall": case "button_replyall":
case "cmd_forward": case "cmd_forward":
case "button_forward": case "button_forward":
case "cmd_forwardInline": case "cmd_forwardInline":
case "cmd_forwardAttachment": case "cmd_forwardAttachment":
case "cmd_editAsNew": case "cmd_editAsNew":
case "cmd_createFilterFromMenu": case "cmd_createFilterFromMenu":
case "cmd_delete": case "cmd_delete":
case "button_delete": case "button_delete":
case "button_junk": case "button_junk":
case "cmd_shiftDelete": case "cmd_shiftDelete":
case "cmd_nextMsg": case "cmd_nextMsg":
case "button_next": case "button_next":
case "button_previous": case "button_previous":
case "cmd_nextUnreadMsg": case "cmd_nextUnreadMsg":
case "cmd_nextFlaggedMsg": case "cmd_nextFlaggedMsg":
case "cmd_nextUnreadThread": case "cmd_nextUnreadThread":
case "cmd_previousMsg": case "cmd_previousMsg":
case "cmd_previousUnreadMsg": case "cmd_previousUnreadMsg":
case "cmd_previousFlaggedMsg": case "cmd_previousFlaggedMsg":
case "button_goForward": case "button_goForward":
case "button_goBack": case "button_goBack":
case "cmd_goForward": case "cmd_goForward":
case "cmd_goBack": case "cmd_goBack":
case "cmd_goStartPage": case "cmd_goStartPage":
case "cmd_viewAllMsgs": case "cmd_viewAllMsgs":
case "cmd_viewUnreadMsgs": case "cmd_viewUnreadMsgs":
case "cmd_viewThreadsWithUnread": case "cmd_viewThreadsWithUnread":
case "cmd_viewWatchedThreadsWithUnread": case "cmd_viewWatchedThreadsWithUnread":
case "cmd_viewIgnoredThreads": case "cmd_viewIgnoredThreads":
case "cmd_undo": case "cmd_undo":
case "cmd_redo": case "cmd_redo":
case "cmd_expandAllThreads": case "cmd_expandAllThreads":
case "cmd_collapseAllThreads": case "cmd_collapseAllThreads":
case "cmd_renameFolder": case "cmd_renameFolder":
case "cmd_sendUnsentMsgs": case "cmd_sendUnsentMsgs":
case "cmd_openMessage": case "cmd_openMessage":
case "button_print": case "button_print":
case "cmd_print": case "cmd_print":
case "cmd_printpreview": case "cmd_printpreview":
case "cmd_printSetup": case "cmd_printSetup":
case "cmd_saveAsFile": case "cmd_saveAsFile":
case "cmd_saveAsTemplate": case "cmd_saveAsTemplate":
case "cmd_properties": case "cmd_properties":
case "cmd_viewPageSource": case "cmd_viewPageSource":
case "cmd_setFolderCharset": case "cmd_setFolderCharset":
case "cmd_reload": case "cmd_reload":
case "button_getNewMessages": case "button_getNewMessages":
case "cmd_getNewMessages": case "cmd_getNewMessages":
case "cmd_getMsgsForAuthAccounts": case "cmd_getMsgsForAuthAccounts":
case "cmd_getNextNMessages": case "cmd_getNextNMessages":
case "cmd_find": case "cmd_find":
case "cmd_findAgain": case "cmd_findAgain":
case "cmd_findPrevious": case "cmd_findPrevious":
case "cmd_search": case "cmd_search":
case "button_mark": case "button_mark":
case "cmd_tag": case "cmd_tag":
case "cmd_markAsRead": case "cmd_markAsRead":
case "cmd_markAllRead": case "cmd_markAllRead":
case "cmd_markThreadAsRead": case "cmd_markThreadAsRead":
case "cmd_markReadByDate": case "cmd_markReadByDate":
case "cmd_markAsFlagged": case "cmd_markAsFlagged":
case "cmd_markAsJunk": case "cmd_markAsJunk":
case "cmd_markAsNotJunk": case "cmd_markAsNotJunk":
case "cmd_recalculateJunkScore": case "cmd_recalculateJunkScore":
case "cmd_applyFilters": case "cmd_applyFilters":
case "cmd_runJunkControls": case "cmd_runJunkControls":
case "cmd_deleteJunk": case "cmd_deleteJunk":
case "button_file": case "button_file":
case "cmd_file": case "cmd_file":
case "cmd_emptyTrash": case "cmd_emptyTrash":
case "cmd_compactFolder": case "cmd_compactFolder":
case "cmd_settingsOffline": case "cmd_settingsOffline":
case "cmd_close": case "cmd_close":
case "cmd_selectAll": case "cmd_selectAll":
case "cmd_selectThread": case "cmd_selectThread":
case "cmd_moveToFolderAgain": case "cmd_moveToFolderAgain":
return true; return true;
case "cmd_downloadFlagged": case "cmd_downloadFlagged":
case "cmd_downloadSelected": case "cmd_downloadSelected":
case "cmd_synchronizeOffline": case "cmd_synchronizeOffline":
@ -238,10 +238,10 @@ var DefaultController =
case "cmd_killThread": case "cmd_killThread":
return(isNewsURI(GetFirstSelectedMessage())); return(isNewsURI(GetFirstSelectedMessage()));
default: default:
return false; return false;
} }
}, },
isCommandEnabled: function(command) isCommandEnabled: function(command)
{ {
@ -311,7 +311,7 @@ var DefaultController =
} }
return false; return false;
case "cmd_printpreview": case "cmd_printpreview":
if ( GetNumSelectedMessages() == 1 && gDBView) if ( GetNumSelectedMessages() == 1 && gDBView)
{ {
gDBView.getCommandStatus(nsMsgViewCommandType.cmdRequiringMsgBody, enabled, checkStatus); gDBView.getCommandStatus(nsMsgViewCommandType.cmdRequiringMsgBody, enabled, checkStatus);
return enabled.value; return enabled.value;
@ -436,101 +436,101 @@ var DefaultController =
return false; return false;
}, },
doCommand: function(command) doCommand: function(command)
{ {
// if the user invoked a key short cut then it is possible that we got here for a command which is // if the user invoked a key short cut then it is possible that we got here for a command which is
// really disabled. kick out if the command should be disabled. // really disabled. kick out if the command should be disabled.
if (!this.isCommandEnabled(command)) return; if (!this.isCommandEnabled(command)) return;
switch ( command ) switch ( command )
{ {
case "cmd_close": case "cmd_close":
CloseMailWindow(); CloseMailWindow();
break; break;
case "button_getNewMessages": case "button_getNewMessages":
case "cmd_getNewMessages": case "cmd_getNewMessages":
MsgGetMessage(); MsgGetMessage();
break; break;
case "cmd_getMsgsForAuthAccounts": case "cmd_getMsgsForAuthAccounts":
MsgGetMessagesForAllAuthenticatedAccounts(); MsgGetMessagesForAllAuthenticatedAccounts();
break; break;
case "cmd_getNextNMessages": case "cmd_getNextNMessages":
MsgGetNextNMessages(); MsgGetNextNMessages();
break; break;
case "cmd_reply": case "cmd_reply":
MsgReplyMessage(null); MsgReplyMessage(null);
break; break;
case "cmd_replySender": case "cmd_replySender":
MsgReplySender(null); MsgReplySender(null);
break; break;
case "cmd_replyGroup": case "cmd_replyGroup":
MsgReplyGroup(null); MsgReplyGroup(null);
break; break;
case "cmd_replyall": case "cmd_replyall":
MsgReplyToAllMessage(null); MsgReplyToAllMessage(null);
break; break;
case "cmd_forward": case "cmd_forward":
MsgForwardMessage(null); MsgForwardMessage(null);
break; break;
case "cmd_forwardInline": case "cmd_forwardInline":
MsgForwardAsInline(null); MsgForwardAsInline(null);
break; break;
case "cmd_forwardAttachment": case "cmd_forwardAttachment":
MsgForwardAsAttachment(null); MsgForwardAsAttachment(null);
break; break;
case "cmd_editAsNew": case "cmd_editAsNew":
MsgEditMessageAsNew(); MsgEditMessageAsNew();
break; break;
case "cmd_createFilterFromMenu": case "cmd_createFilterFromMenu":
MsgCreateFilter(); MsgCreateFilter();
break; break;
case "cmd_createFilterFromPopup": case "cmd_createFilterFromPopup":
break;// This does nothing because the createfilter is invoked from the popupnode oncommand. break;// This does nothing because the createfilter is invoked from the popupnode oncommand.
case "button_delete": case "button_delete":
case "cmd_delete": case "cmd_delete":
// if the user deletes a message before its mark as read timer goes off, we should mark it as read // if the user deletes a message before its mark as read timer goes off, we should mark it as read
// this ensures that we clear the biff indicator from the system tray when the user deletes the new message // this ensures that we clear the biff indicator from the system tray when the user deletes the new message
if (gMarkViewedMessageAsReadTimer) if (gMarkViewedMessageAsReadTimer)
MarkCurrentMessageAsRead(); MarkCurrentMessageAsRead();
SetNextMessageAfterDelete(); SetNextMessageAfterDelete();
gDBView.doCommand(nsMsgViewCommandType.deleteMsg); gDBView.doCommand(nsMsgViewCommandType.deleteMsg);
break; break;
case "cmd_shiftDelete": case "cmd_shiftDelete":
if (gMarkViewedMessageAsReadTimer) if (gMarkViewedMessageAsReadTimer)
MarkCurrentMessageAsRead(); MarkCurrentMessageAsRead();
SetNextMessageAfterDelete(); SetNextMessageAfterDelete();
gDBView.doCommand(nsMsgViewCommandType.deleteNoTrash); gDBView.doCommand(nsMsgViewCommandType.deleteNoTrash);
break; break;
case "cmd_killThread": case "cmd_killThread":
/* kill thread kills the thread and then does a next unread */ /* kill thread kills the thread and then does a next unread */
GoNextMessage(nsMsgNavigationType.toggleThreadKilled, true); GoNextMessage(nsMsgNavigationType.toggleThreadKilled, true);
break; break;
case "cmd_watchThread": case "cmd_watchThread":
gDBView.doCommand(nsMsgViewCommandType.toggleThreadWatched); gDBView.doCommand(nsMsgViewCommandType.toggleThreadWatched);
break; break;
case "button_next": case "button_next":
case "cmd_nextUnreadMsg": case "cmd_nextUnreadMsg":
MsgNextUnreadMessage(); MsgNextUnreadMessage();
break; break;
case "cmd_nextUnreadThread": case "cmd_nextUnreadThread":
MsgNextUnreadThread(); MsgNextUnreadThread();
break; break;
case "cmd_nextMsg": case "cmd_nextMsg":
MsgNextMessage(); MsgNextMessage();
break; break;
case "cmd_nextFlaggedMsg": case "cmd_nextFlaggedMsg":
MsgNextFlaggedMessage(); MsgNextFlaggedMessage();
break; break;
case "cmd_previousMsg": case "cmd_previousMsg":
MsgPreviousMessage(); MsgPreviousMessage();
break; break;
case "button_previous": case "button_previous":
case "cmd_previousUnreadMsg": case "cmd_previousUnreadMsg":
MsgPreviousUnreadMessage(); MsgPreviousUnreadMessage();
break; break;
case "cmd_previousFlaggedMsg": case "cmd_previousFlaggedMsg":
MsgPreviousFlaggedMessage(); MsgPreviousFlaggedMessage();
break; break;
case "button_goForward": case "button_goForward":
case "cmd_goForward": case "cmd_goForward":
MsgGoForward(); MsgGoForward();
@ -543,76 +543,76 @@ var DefaultController =
HideMessageHeaderPane(); HideMessageHeaderPane();
loadStartPage(); loadStartPage();
break; break;
case "cmd_viewAllMsgs": case "cmd_viewAllMsgs":
case "cmd_viewThreadsWithUnread": case "cmd_viewThreadsWithUnread":
case "cmd_viewWatchedThreadsWithUnread": case "cmd_viewWatchedThreadsWithUnread":
case "cmd_viewUnreadMsgs": case "cmd_viewUnreadMsgs":
case "cmd_viewIgnoredThreads": case "cmd_viewIgnoredThreads":
SwitchView(command); SwitchView(command);
break; break;
case "cmd_undo": case "cmd_undo":
messenger.undo(msgWindow); messenger.undo(msgWindow);
break; break;
case "cmd_redo": case "cmd_redo":
messenger.redo(msgWindow); messenger.redo(msgWindow);
break; break;
case "cmd_expandAllThreads": case "cmd_expandAllThreads":
gDBView.doCommand(nsMsgViewCommandType.expandAll); gDBView.doCommand(nsMsgViewCommandType.expandAll);
break; break;
case "cmd_collapseAllThreads": case "cmd_collapseAllThreads":
gDBView.doCommand(nsMsgViewCommandType.collapseAll); gDBView.doCommand(nsMsgViewCommandType.collapseAll);
break; break;
case "cmd_renameFolder": case "cmd_renameFolder":
MsgRenameFolder(); MsgRenameFolder();
return; return;
case "cmd_sendUnsentMsgs": case "cmd_sendUnsentMsgs":
MsgSendUnsentMsgs(); MsgSendUnsentMsgs();
return; return;
case "cmd_openMessage": case "cmd_openMessage":
MsgOpenSelectedMessages(); MsgOpenSelectedMessages();
return; return;
case "cmd_printSetup": case "cmd_printSetup":
PrintUtils.showPageSetup(); PrintUtils.showPageSetup();
return; return;
case "cmd_print": case "cmd_print":
PrintEnginePrint(); PrintEnginePrint();
return; return;
case "cmd_printpreview": case "cmd_printpreview":
PrintEnginePrintPreview(); PrintEnginePrintPreview();
return; return;
case "cmd_saveAsFile": case "cmd_saveAsFile":
MsgSaveAsFile(); MsgSaveAsFile();
return; return;
case "cmd_saveAsTemplate": case "cmd_saveAsTemplate":
MsgSaveAsTemplate(); MsgSaveAsTemplate();
return; return;
case "cmd_viewPageSource": case "cmd_viewPageSource":
MsgViewPageSource(); MsgViewPageSource();
return; return;
case "cmd_setFolderCharset": case "cmd_setFolderCharset":
MsgSetFolderCharset(); MsgSetFolderCharset();
return; return;
case "cmd_reload": case "cmd_reload":
MsgReload(); MsgReload();
return; return;
case "cmd_find": case "cmd_find":
// make sure the message pane has focus before we start a find since we only support searching // make sure the message pane has focus before we start a find since we only support searching
// within the message body. Do it here and not in MsgFind() which can be called from standalone where we don't want to set focus // within the message body. Do it here and not in MsgFind() which can be called from standalone where we don't want to set focus
SetFocusMessagePane(); SetFocusMessagePane();
MsgFind(); MsgFind();
return; return;
case "cmd_findAgain": case "cmd_findAgain":
// make sure the message pane has focus before we start a find since we only support searching // make sure the message pane has focus before we start a find since we only support searching
// within the message body. Do it here and not in MsgFind() which can be called from standalone where we don't want to set focus // within the message body. Do it here and not in MsgFind() which can be called from standalone where we don't want to set focus
SetFocusMessagePane(); SetFocusMessagePane();
MsgFindAgain(false); MsgFindAgain(false);
return; return;
case "cmd_findPrevious": case "cmd_findPrevious":
// make sure the message pane has focus before we start a find since we only support searching // make sure the message pane has focus before we start a find since we only support searching
// within the message body. Do it here and not in MsgFind() which can be called from standalone where we don't want to set focus // within the message body. Do it here and not in MsgFind() which can be called from standalone where we don't want to set focus
SetFocusMessagePane(); SetFocusMessagePane();
MsgFindAgain(true); MsgFindAgain(true);
return; return;
case "cmd_markReadByDate": case "cmd_markReadByDate":
MsgMarkReadByDate(); MsgMarkReadByDate();
return; return;
@ -623,30 +623,30 @@ var DefaultController =
MsgSearchMessages(); MsgSearchMessages();
return; return;
case "button_mark": case "button_mark":
case "cmd_markAsRead": case "cmd_markAsRead":
MsgMarkMsgAsRead(null); MsgMarkMsgAsRead(null);
return; return;
case "cmd_markThreadAsRead": case "cmd_markThreadAsRead":
MsgMarkThreadAsRead(); MsgMarkThreadAsRead();
return; return;
case "cmd_markAllRead": case "cmd_markAllRead":
gDBView.doCommand(nsMsgViewCommandType.markAllRead); gDBView.doCommand(nsMsgViewCommandType.markAllRead);
return; return;
case "button_junk": case "button_junk":
MsgJunk(); MsgJunk();
return; return;
case "cmd_stop": case "cmd_stop":
MsgStop(); MsgStop();
return; return;
case "cmd_markAsFlagged": case "cmd_markAsFlagged":
MsgMarkAsFlagged(null); MsgMarkAsFlagged(null);
return; return;
case "cmd_markAsJunk": case "cmd_markAsJunk":
JunkSelectedMessages(true); JunkSelectedMessages(true);
return; return;
case "cmd_markAsNotJunk": case "cmd_markAsNotJunk":
JunkSelectedMessages(false); JunkSelectedMessages(false);
return; return;
case "cmd_recalculateJunkScore": case "cmd_recalculateJunkScore":
analyzeMessagesForJunk(); analyzeMessagesForJunk();
return; return;
@ -659,12 +659,12 @@ var DefaultController =
case "cmd_deleteJunk": case "cmd_deleteJunk":
deleteJunkInFolder(); deleteJunkInFolder();
return; return;
case "cmd_emptyTrash": case "cmd_emptyTrash":
MsgEmptyTrash(); MsgEmptyTrash();
return; return;
case "cmd_compactFolder": case "cmd_compactFolder":
MsgCompactFolder(true); MsgCompactFolder(true);
return; return;
case "cmd_downloadFlagged": case "cmd_downloadFlagged":
MsgDownloadFlagged(); MsgDownloadFlagged();
break; break;
@ -697,18 +697,18 @@ var DefaultController =
case "cmd_selectThread": case "cmd_selectThread":
gDBView.doCommand(nsMsgViewCommandType.selectThread); gDBView.doCommand(nsMsgViewCommandType.selectThread);
break; break;
} }
}, },
onEvent: function(event) onEvent: function(event)
{ {
// on blur events set the menu item texts back to the normal values // on blur events set the menu item texts back to the normal values
if ( event == 'blur' ) if ( event == 'blur' )
{ {
goSetMenuValue('cmd_undo', 'valueDefault'); goSetMenuValue('cmd_undo', 'valueDefault');
goSetMenuValue('cmd_redo', 'valueDefault'); goSetMenuValue('cmd_redo', 'valueDefault');
} }
} }
}; };
function GetNumSelectedMessages() function GetNumSelectedMessages()
@ -760,29 +760,29 @@ function WhichPaneHasFocus()
if (top.document.commandDispatcher.focusedWindow == GetMessagePaneFrame()) if (top.document.commandDispatcher.focusedWindow == GetMessagePaneFrame())
return messagePane; return messagePane;
var currentNode = top.document.commandDispatcher.focusedElement; var currentNode = top.document.commandDispatcher.focusedElement;
while (currentNode) { while (currentNode) {
if (currentNode === threadTree || if (currentNode === threadTree ||
currentNode === folderTree || currentNode === folderTree ||
currentNode === messagePane) currentNode === messagePane)
return currentNode; return currentNode;
currentNode = currentNode.parentNode; currentNode = currentNode.parentNode;
} }
return null; return null;
} }
function SetupCommandUpdateHandlers() function SetupCommandUpdateHandlers()
{ {
var widget; var widget;
// folder pane // folder pane
widget = GetFolderTree(); widget = GetFolderTree();
if ( widget ) if ( widget )
widget.controllers.appendController(FolderPaneController); widget.controllers.appendController(FolderPaneController);
top.controllers.insertControllerAt(0, DefaultController); top.controllers.insertControllerAt(0, DefaultController);
} }
function IsSendUnsentMsgsEnabled(folderResource) function IsSendUnsentMsgsEnabled(folderResource)
@ -888,7 +888,7 @@ function IsPropertiesEnabled(command)
function IsViewNavigationItemEnabled() function IsViewNavigationItemEnabled()
{ {
return IsFolderSelected(); return IsFolderSelected();
} }
function IsFolderSelected() function IsFolderSelected()
@ -976,16 +976,16 @@ function SetFocusThreadPaneIfNotOnMessagePane()
// 3pane related commands. Need to go in own file. Putting here for the moment. // 3pane related commands. Need to go in own file. Putting here for the moment.
function MsgNextMessage() function MsgNextMessage()
{ {
GoNextMessage(nsMsgNavigationType.nextMessage, false ); GoNextMessage(nsMsgNavigationType.nextMessage, false );
} }
function MsgNextUnreadMessage() function MsgNextUnreadMessage()
{ {
GoNextMessage(nsMsgNavigationType.nextUnreadMessage, true); GoNextMessage(nsMsgNavigationType.nextUnreadMessage, true);
} }
function MsgNextFlaggedMessage() function MsgNextFlaggedMessage()
{ {
GoNextMessage(nsMsgNavigationType.nextFlagged, true); GoNextMessage(nsMsgNavigationType.nextFlagged, true);
} }
function MsgNextUnreadThread() function MsgNextUnreadThread()
@ -1000,12 +1000,12 @@ function MsgPreviousMessage()
function MsgPreviousUnreadMessage() function MsgPreviousUnreadMessage()
{ {
GoNextMessage(nsMsgNavigationType.previousUnreadMessage, true); GoNextMessage(nsMsgNavigationType.previousUnreadMessage, true);
} }
function MsgPreviousFlaggedMessage() function MsgPreviousFlaggedMessage()
{ {
GoNextMessage(nsMsgNavigationType.previousFlagged, true); GoNextMessage(nsMsgNavigationType.previousFlagged, true);
} }
function MsgGoForward() function MsgGoForward()
@ -1020,22 +1020,22 @@ function MsgGoBack()
function GetFolderNameFromUri(uri, tree) function GetFolderNameFromUri(uri, tree)
{ {
var folderResource = RDF.GetResource(uri); var folderResource = RDF.GetResource(uri);
var db = tree.database; var db = tree.database;
var nameProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#Name'); var nameProperty = RDF.GetResource('http://home.netscape.com/NC-rdf#Name');
var nameResult; var nameResult;
try { try {
nameResult = db.GetTarget(folderResource, nameProperty , true); nameResult = db.GetTarget(folderResource, nameProperty , true);
} }
catch (ex) { catch (ex) {
return ""; return "";
} }
nameResult = nameResult.QueryInterface(Components.interfaces.nsIRDFLiteral); nameResult = nameResult.QueryInterface(Components.interfaces.nsIRDFLiteral);
return nameResult.Value; return nameResult.Value;
} }
function SwitchPaneFocus(event) function SwitchPaneFocus(event)

2
mozilla/mail/base/content/mailWindow.js
View File

@ -591,7 +591,7 @@ function OpenInboxForServer(server)
var inboxFolder = GetInboxFolder(server); var inboxFolder = GetInboxFolder(server);
SelectFolder(inboxFolder.URI); SelectFolder(inboxFolder.URI);
if (MailOfflineMgr.isOnline() || MailOfflineMgr.getNewMail()) { if (MailOfflineMgr.isOnline() || MailOfflineMgr.getNewMail()) {
if (server.type != "imap") if (server.type != "imap")
GetMessagesForInboxOnServer(server); GetMessagesForInboxOnServer(server);
} }

8
mozilla/mail/base/content/mailWindowOverlay.xul
View File

@ -1835,12 +1835,12 @@
<menuseparator/> <menuseparator/>
<menuitem id="runJunkControls" <menuitem id="runJunkControls"
label="&runJunkControls.label;" label="&runJunkControls.label;"
accesskey="&runJunkControls.accesskey;" accesskey="&runJunkControls.accesskey;"
command="cmd_runJunkControls"/> command="cmd_runJunkControls"/>
<menuitem id="deleteJunk" <menuitem id="deleteJunk"
label="&deleteJunk.label;" label="&deleteJunk.label;"
accesskey="&deleteJunk.accesskey;" accesskey="&deleteJunk.accesskey;"
command="cmd_deleteJunk"/> command="cmd_deleteJunk"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_import" label="&importCmd.label;" <menuitem id="menu_import" label="&importCmd.label;"
accesskey="&importCmd.accesskey;" accesskey="&importCmd.accesskey;"

466
mozilla/mail/base/content/messageWindow.js
View File

@ -198,12 +198,12 @@ nsMsgDBViewCommandUpdater.prototype =
function HandleDeleteOrMoveMsgCompleted(folder) function HandleDeleteOrMoveMsgCompleted(folder)
{ {
var folderResource = folder.QueryInterface(Components.interfaces.nsIRDFResource); var folderResource = folder.QueryInterface(Components.interfaces.nsIRDFResource);
if (!folderResource) if (!folderResource)
return; return;
if ((folderResource.Value == gCurrentFolderUri) && gCurrentMessageIsDeleted) if ((folderResource.Value == gCurrentFolderUri) && gCurrentMessageIsDeleted)
{ {
gDBView.onDeleteCompleted(true); gDBView.onDeleteCompleted(true);
gCurrentMessageIsDeleted = false; gCurrentMessageIsDeleted = false;
if (gNextMessageViewIndexAfterDelete != nsMsgViewIndex_None) if (gNextMessageViewIndexAfterDelete != nsMsgViewIndex_None)
@ -221,7 +221,7 @@ function HandleDeleteOrMoveMsgCompleted(folder)
// close the stand alone window because there are no more messages in the folder // close the stand alone window because there are no more messages in the folder
window.close(); window.close();
} }
} }
} }
function HandleDeleteOrMoveMsgFailed(folder) function HandleDeleteOrMoveMsgFailed(folder)
@ -461,21 +461,21 @@ function HideToolbarButtons()
function HideMenus() function HideMenus()
{ {
var message_menuitem=document.getElementById('menu_showMessage'); var message_menuitem=document.getElementById('menu_showMessage');
if (message_menuitem) if (message_menuitem)
message_menuitem.setAttribute("hidden", "true"); message_menuitem.setAttribute("hidden", "true");
var showSearch_showMessage_Separator = document.getElementById('menu_showSearch_showMessage_Separator'); var showSearch_showMessage_Separator = document.getElementById('menu_showSearch_showMessage_Separator');
if (showSearch_showMessage_Separator) if (showSearch_showMessage_Separator)
showSearch_showMessage_Separator.setAttribute("hidden", "true"); showSearch_showMessage_Separator.setAttribute("hidden", "true");
var expandOrCollapseMenu = document.getElementById('menu_expandOrCollapse'); var expandOrCollapseMenu = document.getElementById('menu_expandOrCollapse');
if (expandOrCollapseMenu) if (expandOrCollapseMenu)
expandOrCollapseMenu.setAttribute("hidden", "true"); expandOrCollapseMenu.setAttribute("hidden", "true");
var renameFolderMenu = document.getElementById('menu_renameFolder'); var renameFolderMenu = document.getElementById('menu_renameFolder');
if (renameFolderMenu) if (renameFolderMenu)
renameFolderMenu.setAttribute("hidden", "true"); renameFolderMenu.setAttribute("hidden", "true");
var viewLayoutMenu = document.getElementById("menu_MessagePaneLayout"); var viewLayoutMenu = document.getElementById("menu_MessagePaneLayout");
if (viewLayoutMenu) if (viewLayoutMenu)
@ -485,41 +485,41 @@ function HideMenus()
if (viewFolderMenu) if (viewFolderMenu)
viewFolderMenu.setAttribute("hidden", "true"); viewFolderMenu.setAttribute("hidden", "true");
var viewMessagesMenu = document.getElementById('viewMessagesMenu'); var viewMessagesMenu = document.getElementById('viewMessagesMenu');
if (viewMessagesMenu) if (viewMessagesMenu)
viewMessagesMenu.setAttribute("hidden", "true"); viewMessagesMenu.setAttribute("hidden", "true");
var viewMessageViewMenu = document.getElementById('viewMessageViewMenu'); var viewMessageViewMenu = document.getElementById('viewMessageViewMenu');
if (viewMessageViewMenu) if (viewMessageViewMenu)
viewMessageViewMenu.setAttribute("hidden", "true"); viewMessageViewMenu.setAttribute("hidden", "true");
var viewMessagesMenuSeparator = document.getElementById('viewMessagesMenuSeparator'); var viewMessagesMenuSeparator = document.getElementById('viewMessagesMenuSeparator');
if (viewMessagesMenuSeparator) if (viewMessagesMenuSeparator)
viewMessagesMenuSeparator.setAttribute("hidden", "true"); viewMessagesMenuSeparator.setAttribute("hidden", "true");
var openMessageMenu = document.getElementById('openMessageWindowMenuitem'); var openMessageMenu = document.getElementById('openMessageWindowMenuitem');
if (openMessageMenu) if (openMessageMenu)
openMessageMenu.setAttribute("hidden", "true"); openMessageMenu.setAttribute("hidden", "true");
var viewSortMenuSeparator = document.getElementById('viewSortMenuSeparator'); var viewSortMenuSeparator = document.getElementById('viewSortMenuSeparator');
if (viewSortMenuSeparator) if (viewSortMenuSeparator)
viewSortMenuSeparator.setAttribute("hidden", "true"); viewSortMenuSeparator.setAttribute("hidden", "true");
var viewSortMenu = document.getElementById('viewSortMenu'); var viewSortMenu = document.getElementById('viewSortMenu');
if (viewSortMenu) if (viewSortMenu)
viewSortMenu.setAttribute("hidden", "true"); viewSortMenu.setAttribute("hidden", "true");
var emptryTrashMenu = document.getElementById('menu_emptyTrash'); var emptryTrashMenu = document.getElementById('menu_emptyTrash');
if (emptryTrashMenu) if (emptryTrashMenu)
emptryTrashMenu.setAttribute("hidden", "true"); emptryTrashMenu.setAttribute("hidden", "true");
var menuPropertiesSeparator = document.getElementById("editPropertiesSeparator"); var menuPropertiesSeparator = document.getElementById("editPropertiesSeparator");
if (menuPropertiesSeparator) if (menuPropertiesSeparator)
menuPropertiesSeparator.setAttribute("hidden", "true"); menuPropertiesSeparator.setAttribute("hidden", "true");
var menuProperties = document.getElementById('menu_properties'); var menuProperties = document.getElementById('menu_properties');
if (menuProperties) if (menuProperties)
menuProperties.setAttribute("hidden", "true"); menuProperties.setAttribute("hidden", "true");
var favoriteFolder = document.getElementById('menu_favoriteFolder'); var favoriteFolder = document.getElementById('menu_favoriteFolder');
if (favoriteFolder) if (favoriteFolder)
@ -528,35 +528,35 @@ function HideMenus()
favoriteFolder.setAttribute("hidden", "true"); favoriteFolder.setAttribute("hidden", "true");
} }
var compactFolderMenu = document.getElementById('menu_compactFolder'); var compactFolderMenu = document.getElementById('menu_compactFolder');
if (compactFolderMenu) if (compactFolderMenu)
compactFolderMenu.setAttribute("hidden", "true"); compactFolderMenu.setAttribute("hidden", "true");
var trashSeparator = document.getElementById('trashMenuSeparator'); var trashSeparator = document.getElementById('trashMenuSeparator');
if (trashSeparator) if (trashSeparator)
trashSeparator.setAttribute("hidden", "true"); trashSeparator.setAttribute("hidden", "true");
var goStartPageSeparator = document.getElementById('goNextSeparator'); var goStartPageSeparator = document.getElementById('goNextSeparator');
if (goStartPageSeparator) if (goStartPageSeparator)
goStartPageSeparator.hidden = true; goStartPageSeparator.hidden = true;
var goStartPage = document.getElementById('goStartPage'); var goStartPage = document.getElementById('goStartPage');
if (goStartPage) if (goStartPage)
goStartPage.hidden = true; goStartPage.hidden = true;
} }
function OnUnloadMessageWindow() function OnUnloadMessageWindow()
{ {
// FIX ME - later we will be able to use onunload from the overlay // FIX ME - later we will be able to use onunload from the overlay
OnUnloadMsgHeaderPane(); OnUnloadMsgHeaderPane();
gPhishingDetector.shutdown(); gPhishingDetector.shutdown();
OnMailWindowUnload(); OnMailWindowUnload();
} }
function CreateMessageWindowGlobals() function CreateMessageWindowGlobals()
{ {
gCompositeDataSource = Components.classes[compositeDataSourceContractID].createInstance(); gCompositeDataSource = Components.classes[compositeDataSourceContractID].createInstance();
gCompositeDataSource = gCompositeDataSource.QueryInterface(Components.interfaces.nsIRDFCompositeDataSource); gCompositeDataSource = gCompositeDataSource.QueryInterface(Components.interfaces.nsIRDFCompositeDataSource);
} }
function InitializeDataSources() function InitializeDataSources()
@ -579,25 +579,25 @@ function GetSelectedMsgFolders()
function GetFirstSelectedMessage() function GetFirstSelectedMessage()
{ {
return GetLoadedMessage(); return GetLoadedMessage();
} }
function GetNumSelectedMessages() function GetNumSelectedMessages()
{ {
if (gCurrentMessageUri) if (gCurrentMessageUri)
return 1; return 1;
else else
return 0; return 0;
} }
function GetSelectedMessages() function GetSelectedMessages()
{ {
var messageArray = new Array(1); var messageArray = new Array(1);
var message = GetLoadedMessage(); var message = GetLoadedMessage();
if (message) if (message)
messageArray[0] = message; messageArray[0] = message;
return messageArray; return messageArray;
} }
function GetSelectedIndices(dbView) function GetSelectedIndices(dbView)
@ -837,98 +837,98 @@ var MessageWindowController =
case "cmd_createFilterFromPopup": case "cmd_createFilterFromPopup":
case "cmd_createFilterFromMenu": case "cmd_createFilterFromMenu":
case "cmd_moveToFolderAgain": case "cmd_moveToFolderAgain":
return true; return true;
case "cmd_synchronizeOffline": case "cmd_synchronizeOffline":
case "cmd_downloadFlagged": case "cmd_downloadFlagged":
case "cmd_downloadSelected": case "cmd_downloadSelected":
return MailOfflineMgr.isOnline(); return MailOfflineMgr.isOnline();
default: default:
return false; return false;
} }
}, },
isCommandEnabled: function(command) isCommandEnabled: function(command)
{ {
switch ( command ) switch ( command )
{ {
case "cmd_createFilterFromPopup": case "cmd_createFilterFromPopup":
case "cmd_createFilterFromMenu": case "cmd_createFilterFromMenu":
var loadedFolder = GetLoadedMsgFolder(); var loadedFolder = GetLoadedMsgFolder();
if (!(loadedFolder && loadedFolder.server.canHaveFilters)) if (!(loadedFolder && loadedFolder.server.canHaveFilters))
return false; return false;
case "cmd_delete": case "cmd_delete":
UpdateDeleteCommand(); UpdateDeleteCommand();
// fall through // fall through
case "button_delete": case "button_delete":
case "cmd_shiftDelete": case "cmd_shiftDelete":
var loadedFolder = GetLoadedMsgFolder(); var loadedFolder = GetLoadedMsgFolder();
return gCurrentMessageUri && loadedFolder && (loadedFolder.canDeleteMessages || isNewsURI(gCurrentFolderUri)); return gCurrentMessageUri && loadedFolder && (loadedFolder.canDeleteMessages || isNewsURI(gCurrentFolderUri));
case "button_junk": case "button_junk":
UpdateJunkToolbarButton(); UpdateJunkToolbarButton();
// fall through // fall through
case "cmd_markAsJunk": case "cmd_markAsJunk":
case "cmd_markAsNotJunk": case "cmd_markAsNotJunk":
case "cmd_recalculateJunkScore": case "cmd_recalculateJunkScore":
// can't do junk on news yet // can't do junk on news yet
return (!isNewsURI(gCurrentFolderUri)); return (!isNewsURI(gCurrentFolderUri));
case "cmd_reply": case "cmd_reply":
case "button_reply": case "button_reply":
case "cmd_replySender": case "cmd_replySender":
case "cmd_replyGroup": case "cmd_replyGroup":
case "cmd_replyall": case "cmd_replyall":
case "button_replyall": case "button_replyall":
case "cmd_forward": case "cmd_forward":
case "button_forward": case "button_forward":
case "cmd_forwardInline": case "cmd_forwardInline":
case "cmd_forwardAttachment": case "cmd_forwardAttachment":
case "cmd_editAsNew": case "cmd_editAsNew":
case "cmd_print": case "cmd_print":
case "cmd_printpreview": case "cmd_printpreview":
case "button_print": case "button_print":
case "cmd_saveAsFile": case "cmd_saveAsFile":
case "cmd_saveAsTemplate": case "cmd_saveAsTemplate":
case "cmd_viewPageSource": case "cmd_viewPageSource":
case "cmd_reload": case "cmd_reload":
case "cmd_find": case "cmd_find":
case "cmd_tag": case "cmd_tag":
case "button_mark": case "button_mark":
case "cmd_markAsRead": case "cmd_markAsRead":
case "cmd_markAllRead": case "cmd_markAllRead":
case "cmd_markThreadAsRead": case "cmd_markThreadAsRead":
case "cmd_markReadByDate": case "cmd_markReadByDate":
return(true); return(true);
case "cmd_markAsFlagged": case "cmd_markAsFlagged":
case "button_file": case "button_file":
case "cmd_file": case "cmd_file":
return ( gCurrentMessageUri != null); return ( gCurrentMessageUri != null);
case "cmd_printSetup": case "cmd_printSetup":
return true; return true;
case "cmd_getNewMessages": case "cmd_getNewMessages":
case "button_getNewMessages": case "button_getNewMessages":
case "cmd_getMsgsForAuthAccounts": case "cmd_getMsgsForAuthAccounts":
return IsGetNewMessagesEnabled(); return IsGetNewMessagesEnabled();
case "cmd_getNextNMessages": case "cmd_getNextNMessages":
return IsGetNextNMessagesEnabled(); return IsGetNextNMessagesEnabled();
case "cmd_downloadFlagged": case "cmd_downloadFlagged":
case "cmd_downloadSelected": case "cmd_downloadSelected":
case "cmd_synchronizeOffline": case "cmd_synchronizeOffline":
return MailOfflineMgr.isOnline(); return MailOfflineMgr.isOnline();
case "cmd_settingsOffline": case "cmd_settingsOffline":
return IsAccountOfflineEnabled(); return IsAccountOfflineEnabled();
case "cmd_close": case "cmd_close":
case "cmd_nextMsg": case "cmd_nextMsg":
case "button_next": case "button_next":
case "cmd_nextUnreadMsg": case "cmd_nextUnreadMsg":
case "cmd_nextUnreadThread": case "cmd_nextUnreadThread":
case "button_previous": case "button_previous":
case "cmd_previousMsg": case "cmd_previousMsg":
case "cmd_previousUnreadMsg": case "cmd_previousUnreadMsg":
return true; return true;
case "cmd_findAgain": case "cmd_findAgain":
case "cmd_findPrevious": case "cmd_findPrevious":
case "cmd_goForward": case "cmd_goForward":
case "cmd_goBack": case "cmd_goBack":
return true; return true;
case "button_goForward": case "button_goForward":
case "button_goBack": case "button_goBack":
case "cmd_goForward": case "cmd_goForward":
@ -951,27 +951,27 @@ var MessageWindowController =
case "cmd_runJunkControls": case "cmd_runJunkControls":
case "cmd_deleteJunk": case "cmd_deleteJunk":
return false; return false;
default: default:
return false; return false;
} }
}, },
doCommand: function(command) doCommand: function(command)
{ {
// if the user invoked a key short cut then it is possible that we got here for a command which is // if the user invoked a key short cut then it is possible that we got here for a command which is
// really disabled. kick out if the command should be disabled. // really disabled. kick out if the command should be disabled.
if (!this.isCommandEnabled(command)) return; if (!this.isCommandEnabled(command)) return;
var navigationType = nsMsgNavigationType.nextUnreadMessage; var navigationType = nsMsgNavigationType.nextUnreadMessage;
switch ( command ) switch ( command )
{ {
case "cmd_close": case "cmd_close":
CloseMailWindow(); CloseMailWindow();
break; break;
case "cmd_getNewMessages": case "cmd_getNewMessages":
MsgGetMessage(); MsgGetMessage();
break; break;
case "cmd_undo": case "cmd_undo":
messenger.undo(msgWindow); messenger.undo(msgWindow);
break; break;
@ -982,32 +982,32 @@ var MessageWindowController =
MsgGetMessagesForAllAuthenticatedAccounts(); MsgGetMessagesForAllAuthenticatedAccounts();
break; break;
case "cmd_getNextNMessages": case "cmd_getNextNMessages":
MsgGetNextNMessages(); MsgGetNextNMessages();
break; break;
case "cmd_reply": case "cmd_reply":
MsgReplyMessage(null); MsgReplyMessage(null);
break; break;
case "cmd_replySender": case "cmd_replySender":
MsgReplySender(null); MsgReplySender(null);
break; break;
case "cmd_replyGroup": case "cmd_replyGroup":
MsgReplyGroup(null); MsgReplyGroup(null);
break; break;
case "cmd_replyall": case "cmd_replyall":
MsgReplyToAllMessage(null); MsgReplyToAllMessage(null);
break; break;
case "cmd_forward": case "cmd_forward":
MsgForwardMessage(null); MsgForwardMessage(null);
break; break;
case "cmd_forwardInline": case "cmd_forwardInline":
MsgForwardAsInline(null); MsgForwardAsInline(null);
break; break;
case "cmd_forwardAttachment": case "cmd_forwardAttachment":
MsgForwardAsAttachment(null); MsgForwardAsAttachment(null);
break; break;
case "cmd_editAsNew": case "cmd_editAsNew":
MsgEditMessageAsNew(); MsgEditMessageAsNew();
break; break;
case "cmd_moveToFolderAgain": case "cmd_moveToFolderAgain":
var folderId = pref.getCharPref("mail.last_msg_movecopy_target_uri"); var folderId = pref.getCharPref("mail.last_msg_movecopy_target_uri");
if (pref.getBoolPref("mail.last_msg_movecopy_was_move")) if (pref.getBoolPref("mail.last_msg_movecopy_was_move"))
@ -1016,77 +1016,77 @@ var MessageWindowController =
MsgCopyMessage(folderId); MsgCopyMessage(folderId);
break; break;
case "cmd_createFilterFromPopup": case "cmd_createFilterFromPopup":
break;// This does nothing because the createfilter is invoked from the popupnode oncommand. break;// This does nothing because the createfilter is invoked from the popupnode oncommand.
case "cmd_createFilterFromMenu": case "cmd_createFilterFromMenu":
MsgCreateFilter(); MsgCreateFilter();
break; break;
case "cmd_delete": case "cmd_delete":
MsgDeleteMessageFromMessageWindow(false, false); MsgDeleteMessageFromMessageWindow(false, false);
break; break;
case "cmd_shiftDelete": case "cmd_shiftDelete":
MsgDeleteMessageFromMessageWindow(true, false); MsgDeleteMessageFromMessageWindow(true, false);
break; break;
case "button_junk": case "button_junk":
MsgJunk(); MsgJunk();
break; break;
case "button_delete": case "button_delete":
MsgDeleteMessageFromMessageWindow(false, true); MsgDeleteMessageFromMessageWindow(false, true);
break; break;
case "cmd_printSetup": case "cmd_printSetup":
PrintUtils.showPageSetup(); PrintUtils.showPageSetup();
break; break;
case "cmd_print": case "cmd_print":
PrintEnginePrint(); PrintEnginePrint();
break; break;
case "cmd_printpreview": case "cmd_printpreview":
PrintEnginePrintPreview(); PrintEnginePrintPreview();
break; break;
case "cmd_saveAsFile": case "cmd_saveAsFile":
MsgSaveAsFile(); MsgSaveAsFile();
break; break;
case "cmd_saveAsTemplate": case "cmd_saveAsTemplate":
MsgSaveAsTemplate(); MsgSaveAsTemplate();
break; break;
case "cmd_viewPageSource": case "cmd_viewPageSource":
MsgViewPageSource(); MsgViewPageSource();
break; break;
case "cmd_reload": case "cmd_reload":
MsgReload(); MsgReload();
break; break;
case "cmd_find": case "cmd_find":
MsgFind(); MsgFind();
break; break;
case "cmd_findAgain": case "cmd_findAgain":
MsgFindAgain(false); MsgFindAgain(false);
break; break;
case "cmd_findPrevious": case "cmd_findPrevious":
MsgFindAgain(true); MsgFindAgain(true);
break; break;
case "cmd_search": case "cmd_search":
MsgSearchMessages(); MsgSearchMessages();
break; break;
case "button_mark": case "button_mark":
case "cmd_markAsRead": case "cmd_markAsRead":
MsgMarkMsgAsRead(null); MsgMarkMsgAsRead(null);
return; return;
case "cmd_markThreadAsRead": case "cmd_markThreadAsRead":
MsgMarkThreadAsRead(); MsgMarkThreadAsRead();
return; return;
case "cmd_markAllRead": case "cmd_markAllRead":
MsgMarkAllRead(); MsgMarkAllRead();
return; return;
case "cmd_markReadByDate": case "cmd_markReadByDate":
MsgMarkReadByDate(); MsgMarkReadByDate();
return; return;
case "cmd_markAsFlagged": case "cmd_markAsFlagged":
MsgMarkAsFlagged(null); MsgMarkAsFlagged(null);
return; return;
case "cmd_markAsJunk": case "cmd_markAsJunk":
JunkSelectedMessages(true); JunkSelectedMessages(true);
return; return;
case "cmd_markAsNotJunk": case "cmd_markAsNotJunk":
JunkSelectedMessages(false); JunkSelectedMessages(false);
return; return;
case "cmd_recalculateJunkScore": case "cmd_recalculateJunkScore":
analyzeMessagesForJunk(); analyzeMessagesForJunk();
return; return;
@ -1108,20 +1108,20 @@ var MessageWindowController =
break; break;
case "cmd_nextUnreadThread": case "cmd_nextUnreadThread":
performNavigation(nsMsgNavigationType.nextUnreadThread); performNavigation(nsMsgNavigationType.nextUnreadThread);
break; break;
case "cmd_nextMsg": case "cmd_nextMsg":
performNavigation(nsMsgNavigationType.nextMessage); performNavigation(nsMsgNavigationType.nextMessage);
break; break;
case "cmd_nextFlaggedMsg": case "cmd_nextFlaggedMsg":
performNavigation(nsMsgNavigationType.nextFlagged); performNavigation(nsMsgNavigationType.nextFlagged);
break; break;
case "cmd_previousMsg": case "cmd_previousMsg":
performNavigation(nsMsgNavigationType.previousMessage); performNavigation(nsMsgNavigationType.previousMessage);
break; break;
case "button_previous": case "button_previous":
case "cmd_previousUnreadMsg": case "cmd_previousUnreadMsg":
performNavigation(nsMsgNavigationType.previousUnreadMessage); performNavigation(nsMsgNavigationType.previousUnreadMessage);
break; break;
case "cmd_previousFlaggedMsg": case "cmd_previousFlaggedMsg":
performNavigation(nsMsgNavigationType.previousFlagged); performNavigation(nsMsgNavigationType.previousFlagged);
break; break;
@ -1132,11 +1132,11 @@ var MessageWindowController =
performNavigation(nsMsgNavigationType.back); performNavigation(nsMsgNavigationType.back);
break; break;
} }
}, },
onEvent: function(event) onEvent: function(event)
{ {
} }
}; };
function LoadMessageByNavigationType(type) function LoadMessageByNavigationType(type)
@ -1175,7 +1175,7 @@ function performNavigation(type)
function SetupCommandUpdateHandlers() function SetupCommandUpdateHandlers()
{ {
top.controllers.insertControllerAt(0, MessageWindowController); top.controllers.insertControllerAt(0, MessageWindowController);
} }
function GetDBView() function GetDBView()

2
mozilla/mail/base/content/messageWindow.xul
View File

@ -98,7 +98,7 @@
<commandset id="mailMarkMenuItems"/> <commandset id="mailMarkMenuItems"/>
<commandset id="mailToolsMenuItems"/> <commandset id="mailToolsMenuItems"/>
<commandset id="mailEditContextMenuItems"/> <commandset id="mailEditContextMenuItems"/>
<commandset id="tasksCommands"/> <commandset id="tasksCommands"/>
<commandset id="commandKeys"/> <commandset id="commandKeys"/>
#ifdef XP_MACOSX #ifdef XP_MACOSX
<commandset id="macWindowMenuItems"/> <commandset id="macWindowMenuItems"/>

6
mozilla/mail/base/content/msgHdrViewOverlay.js
View File

@ -51,8 +51,8 @@
// view in the message header pane. // view in the message header pane.
//////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////
const msgHeaderParserContractID = "@mozilla.org/messenger/headerparser;1"; const msgHeaderParserContractID = "@mozilla.org/messenger/headerparser;1";
const abAddressCollectorContractID = "@mozilla.org/addressbook/services/addressCollecter;1"; const abAddressCollectorContractID = "@mozilla.org/addressbook/services/addressCollecter;1";
const kPersonalAddressbookUri = "moz-abmdbdirectory://abook.mab"; const kPersonalAddressbookUri = "moz-abmdbdirectory://abook.mab";
const kRDFServiceContractID = "@mozilla.org/rdf/rdf-service;1"; const kRDFServiceContractID = "@mozilla.org/rdf/rdf-service;1";
@ -873,7 +873,7 @@ function ShowMessageHeaderPane()
{ {
document.getElementById('msgHeaderView').collapsed = false; document.getElementById('msgHeaderView').collapsed = false;
/* workaround for 39655 */ /* workaround for 39655 */
if (gFolderJustSwitched) if (gFolderJustSwitched)
{ {
var el = document.getElementById("msgHeaderView"); var el = document.getElementById("msgHeaderView");

60
mozilla/mail/base/content/msgMail3PaneWindow.js
View File

@ -976,14 +976,14 @@ function InitPanes()
function InitializeDataSources() function InitializeDataSources()
{ {
//Setup common mailwindow stuff. //Setup common mailwindow stuff.
AddDataSources(); AddDataSources();
//To threadpane move context menu //To threadpane move context menu
SetupMoveCopyMenus('threadPaneContext-moveMenu', accountManagerDataSource, folderDataSource); SetupMoveCopyMenus('threadPaneContext-moveMenu', accountManagerDataSource, folderDataSource);
//To threadpane copy content menu //To threadpane copy content menu
SetupMoveCopyMenus('threadPaneContext-copyMenu', accountManagerDataSource, folderDataSource); SetupMoveCopyMenus('threadPaneContext-copyMenu', accountManagerDataSource, folderDataSource);
} }
function OnFolderUnreadColAttrModified(event) function OnFolderUnreadColAttrModified(event)
@ -1276,41 +1276,41 @@ function GetMessagePaneFrame()
function FindInSidebar(currentWindow, id) function FindInSidebar(currentWindow, id)
{ {
var item = currentWindow.document.getElementById(id); var item = currentWindow.document.getElementById(id);
if(item) if(item)
return item; return item;
for(var i = 0; i < currentWindow.frames.length; i++) for(var i = 0; i < currentWindow.frames.length; i++)
{ {
var frameItem = FindInSidebar(currentWindow.frames[i], id); var frameItem = FindInSidebar(currentWindow.frames[i], id);
if(frameItem) if(frameItem)
return frameItem; return frameItem;
} }
return null; return null;
} }
function GetThreadAndMessagePaneSplitter() function GetThreadAndMessagePaneSplitter()
{ {
if(gThreadAndMessagePaneSplitter) return gThreadAndMessagePaneSplitter; if(gThreadAndMessagePaneSplitter) return gThreadAndMessagePaneSplitter;
var splitter = document.getElementById('threadpane-splitter'); var splitter = document.getElementById('threadpane-splitter');
gThreadAndMessagePaneSplitter = splitter; gThreadAndMessagePaneSplitter = splitter;
return splitter; return splitter;
} }
function GetUnreadCountElement() function GetUnreadCountElement()
{ {
if(gUnreadCount) return gUnreadCount; if(gUnreadCount) return gUnreadCount;
var unreadCount = document.getElementById('unreadMessageCount'); var unreadCount = document.getElementById('unreadMessageCount');
gUnreadCount = unreadCount; gUnreadCount = unreadCount;
return unreadCount; return unreadCount;
} }
function GetTotalCountElement() function GetTotalCountElement()
{ {
if(gTotalCount) return gTotalCount; if(gTotalCount) return gTotalCount;
var totalCount = document.getElementById('totalMessageCount'); var totalCount = document.getElementById('totalMessageCount');
gTotalCount = totalCount; gTotalCount = totalCount;
return totalCount; return totalCount;
} }
function IsMessagePaneCollapsed() function IsMessagePaneCollapsed()
@ -1574,10 +1574,10 @@ function ClearMessageSelection()
function GetCompositeDataSource(command) function GetCompositeDataSource(command)
{ {
if (command == "GetNewMessages" || command == "NewFolder" || command == "MarkAllMessagesRead") if (command == "GetNewMessages" || command == "NewFolder" || command == "MarkAllMessagesRead")
return GetFolderDatasource(); return GetFolderDatasource();
return null; return null;
} }
// Figures out how many messages are selected (hilighted - does not necessarily // Figures out how many messages are selected (hilighted - does not necessarily

2
mozilla/mail/base/content/msgSelectOffline.xul
View File

@ -41,7 +41,7 @@
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" > <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
<dialog xmlns:nc="http://home.netscape.com/NC-rdf#" <dialog xmlns:nc="http://home.netscape.com/NC-rdf#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="select-offline" id="select-offline"

120
mozilla/mail/base/content/subscribe.js
View File

@ -109,23 +109,23 @@ function onServerClick(event)
function SetUpServerMenu() function SetUpServerMenu()
{ {
//dump("SetUpServerMenu()\n"); //dump("SetUpServerMenu()\n");
var serverMenu = document.getElementById("serverMenu"); var serverMenu = document.getElementById("serverMenu");
var menuitems = serverMenu.getElementsByAttribute("id", gServerURI); var menuitems = serverMenu.getElementsByAttribute("id", gServerURI);
try { try {
//dump("gServerURI="+gServerURI+"\n"); //dump("gServerURI="+gServerURI+"\n");
//dump("menuitems="+menuitems+"\n"); //dump("menuitems="+menuitems+"\n");
//dump("menuitems[0]="+menuitems[0]+"\n"); //dump("menuitems[0]="+menuitems[0]+"\n");
//dump("serverMenu="+serverMenu+"\n"); //dump("serverMenu="+serverMenu+"\n");
serverMenu.selectedItem = menuitems[0]; serverMenu.selectedItem = menuitems[0];
} }
catch (ex) { catch (ex) {
//dump("failed to set the selected server: " + ex + "\n"); //dump("failed to set the selected server: " + ex + "\n");
} }
SetServerTypeSpecificTextValues(); SetServerTypeSpecificTextValues();
} }
var MySubscribeListener = { var MySubscribeListener = {
@ -145,7 +145,7 @@ var MySubscribeListener = {
document.getElementById("refreshButton").disabled = false; document.getElementById("refreshButton").disabled = false;
document.getElementById("currentListTab").disabled = false; document.getElementById("currentListTab").disabled = false;
document.getElementById("newGroupsTab").disabled = false; document.getElementById("newGroupsTab").disabled = false;
} }
}; };
function SetUpTree(forceToServer, getOnlyNew) function SetUpTree(forceToServer, getOnlyNew)
@ -236,52 +236,52 @@ function SubscribeOnLoad()
msgWindow.rootDocShell.allowAuth = true; msgWindow.rootDocShell.allowAuth = true;
msgWindow.rootDocShell.appType = Components.interfaces.nsIDocShell.APP_TYPE_MAIL; msgWindow.rootDocShell.appType = Components.interfaces.nsIDocShell.APP_TYPE_MAIL;
// look in arguments[0] for parameters // look in arguments[0] for parameters
if (window.arguments && window.arguments[0]) { if (window.arguments && window.arguments[0]) {
if ( window.arguments[0].okCallback ) { if ( window.arguments[0].okCallback ) {
top.okCallback = window.arguments[0].okCallback; top.okCallback = window.arguments[0].okCallback;
} }
} }
gServerURI = null; gServerURI = null;
if (window.arguments[0].preselectedURI) { if (window.arguments[0].preselectedURI) {
var uri = window.arguments[0].preselectedURI; var uri = window.arguments[0].preselectedURI;
//dump("subscribe: got a uri," + uri + "\n"); //dump("subscribe: got a uri," + uri + "\n");
var folder = GetMsgFolderFromUri(uri, true); var folder = GetMsgFolderFromUri(uri, true);
//dump("folder="+folder+"\n"); //dump("folder="+folder+"\n");
//dump("folder.server="+folder.server+"\n"); //dump("folder.server="+folder.server+"\n");
try { try {
CleanUpSearchView(); CleanUpSearchView();
gSubscribableServer = folder.server.QueryInterface(Components.interfaces.nsISubscribableServer); gSubscribableServer = folder.server.QueryInterface(Components.interfaces.nsISubscribableServer);
// enable (or disable) the search related UI // enable (or disable) the search related UI
EnableSearchUI(); EnableSearchUI();
gServerURI = folder.server.serverURI; gServerURI = folder.server.serverURI;
} }
catch (ex) { catch (ex) {
//dump("not a subscribable server\n"); //dump("not a subscribable server\n");
CleanUpSearchView(); CleanUpSearchView();
gSubscribableServer = null; gSubscribableServer = null;
gServerURI = null; gServerURI = null;
} }
} }
if (!gServerURI) { if (!gServerURI) {
//dump("subscribe: no uri\n"); //dump("subscribe: no uri\n");
//dump("xxx todo: use the default news server. right now, I'm just using the first server\n"); //dump("xxx todo: use the default news server. right now, I'm just using the first server\n");
var serverMenu = document.getElementById("serverMenu"); var serverMenu = document.getElementById("serverMenu");
var menuitems = serverMenu.getElementsByTagName("menuitem"); var menuitems = serverMenu.getElementsByTagName("menuitem");
if (menuitems.length > 1) { if (menuitems.length > 1) {
gServerURI = menuitems[1].id; gServerURI = menuitems[1].id;
} }
else { else {
//dump("xxx todo none of your servers are subscribable\n"); //dump("xxx todo none of your servers are subscribable\n");
//dump("xxx todo fix this by disabling subscribe if no subscribable server or, add a CREATE SERVER button, like in 4.x\n"); //dump("xxx todo fix this by disabling subscribe if no subscribable server or, add a CREATE SERVER button, like in 4.x\n");
return; return;
} }
} }
SetUpServerMenu(); SetUpServerMenu();
ShowCurrentList(); ShowCurrentList();
@ -290,15 +290,15 @@ function SubscribeOnLoad()
function subscribeOK() function subscribeOK()
{ {
//dump("in subscribeOK()\n") //dump("in subscribeOK()\n")
if (top.okCallback) { if (top.okCallback) {
top.okCallback(top.gChangeTable); top.okCallback(top.gChangeTable);
} }
Stop(); Stop();
if (gSubscribableServer) { if (gSubscribableServer) {
gSubscribableServer.subscribeCleanup(); gSubscribableServer.subscribeCleanup();
} }
return true; return true;
} }
function subscribeCancel() function subscribeCancel()

22
mozilla/mail/base/content/widgetglue.js
View File

@ -78,18 +78,18 @@ function GetSelectedFolderURI()
function MsgRenameFolder() function MsgRenameFolder()
{ {
var preselectedURI = GetSelectedFolderURI(); var preselectedURI = GetSelectedFolderURI();
var folderTree = GetFolderTree(); var folderTree = GetFolderTree();
var name = GetFolderNameFromUri(preselectedURI, folderTree); var name = GetFolderNameFromUri(preselectedURI, folderTree);
dump("preselectedURI = " + preselectedURI + "\n"); dump("preselectedURI = " + preselectedURI + "\n");
var dialog = window.openDialog( var dialog = window.openDialog(
"chrome://messenger/content/renameFolderDialog.xul", "chrome://messenger/content/renameFolderDialog.xul",
"newFolder", "newFolder",
"chrome,titlebar,modal", "chrome,titlebar,modal",
{preselectedURI: preselectedURI, {preselectedURI: preselectedURI,
okCallback: RenameFolder, name: name}); okCallback: RenameFolder, name: name});
} }
function RenameFolder(name,uri) function RenameFolder(name,uri)
@ -126,7 +126,7 @@ function RenameFolder(name,uri)
} }
else else
{ {
dump("no folder tree\n"); dump("no folder tree\n");
} }
} }

20
mozilla/mail/components/addrbook/content/abAddressBookNameDialog.js
View File

@ -10,23 +10,23 @@ function abNameOnLoad()
gOkButton = document.documentElement.getButton('accept'); gOkButton = document.documentElement.getButton('accept');
// look in arguments[0] for parameters // look in arguments[0] for parameters
if ("arguments" in window && window.arguments[0]) if ("arguments" in window && window.arguments[0])
{ {
if ("title" in window.arguments[0]) if ("title" in window.arguments[0])
document.title = window.arguments[0].title; document.title = window.arguments[0].title;
if ("okCallback" in window.arguments[0]) if ("okCallback" in window.arguments[0])
top.okCallback = window.arguments[0].okCallback; top.okCallback = window.arguments[0].okCallback;
if ("name" in window.arguments[0]) if ("name" in window.arguments[0])
abName = window.arguments[0].name; abName = window.arguments[0].name;
if ("canRename" in window.arguments[0]) if ("canRename" in window.arguments[0])
gCanRename = window.arguments[0].canRename; gCanRename = window.arguments[0].canRename;
} }
// focus on input // focus on input
gNameInput = document.getElementById('name'); gNameInput = document.getElementById('name');
if (gNameInput) { if (gNameInput) {
if (abName) if (abName)
@ -40,15 +40,15 @@ function abNameOnLoad()
abNameDoOkEnabling() abNameDoOkEnabling()
moveToAlertPosition(); moveToAlertPosition();
} }
function abNameOKButton() function abNameOKButton()
{ {
if (top.okCallback && gCanRename) if (top.okCallback && gCanRename)
top.okCallback(gNameInput.value.replace(/^\s+|\s+$/g, '')); top.okCallback(gNameInput.value.replace(/^\s+|\s+$/g, ''));
return true; return true;
} }
function abNameDoOkEnabling() function abNameDoOkEnabling()

300
mozilla/mail/components/addrbook/content/abCardViewOverlay.js
View File

@ -91,81 +91,81 @@ function OnLoadCardView()
zCustom3 = gAddressBookBundle.getString("propertyCustom3"); zCustom3 = gAddressBookBundle.getString("propertyCustom3");
zCustom4 = gAddressBookBundle.getString("propertyCustom4"); zCustom4 = gAddressBookBundle.getString("propertyCustom4");
var doc = document; var doc = document;
/* data for address book, prefixes: "cvb" = card view box /* data for address book, prefixes: "cvb" = card view box
"cvh" = crad view header "cvh" = crad view header
"cv" = card view (normal fields) */ "cv" = card view (normal fields) */
cvData = new Object; cvData = new Object;
// Card View Box // Card View Box
cvData.CardViewBox = doc.getElementById("CardViewInnerBox"); cvData.CardViewBox = doc.getElementById("CardViewInnerBox");
// Title // Title
cvData.CardTitle = doc.getElementById("CardTitle"); cvData.CardTitle = doc.getElementById("CardTitle");
// Name section // Name section
cvData.cvbContact = doc.getElementById("cvbContact"); cvData.cvbContact = doc.getElementById("cvbContact");
cvData.cvhContact = doc.getElementById("cvhContact"); cvData.cvhContact = doc.getElementById("cvhContact");
cvData.cvNickname = doc.getElementById("cvNickname"); cvData.cvNickname = doc.getElementById("cvNickname");
cvData.cvDisplayName = doc.getElementById("cvDisplayName"); cvData.cvDisplayName = doc.getElementById("cvDisplayName");
cvData.cvEmail1Box = doc.getElementById("cvEmail1Box"); cvData.cvEmail1Box = doc.getElementById("cvEmail1Box");
cvData.cvEmail1 = doc.getElementById("cvEmail1"); cvData.cvEmail1 = doc.getElementById("cvEmail1");
cvData.cvScreennameBox = doc.getElementById("cvScreennameBox"); cvData.cvScreennameBox = doc.getElementById("cvScreennameBox");
cvData.cvAimPresence = doc.getElementById("cvAimPresence"); cvData.cvAimPresence = doc.getElementById("cvAimPresence");
cvData.cvScreenname = doc.getElementById("cvScreenname"); cvData.cvScreenname = doc.getElementById("cvScreenname");
cvData.cvBuddyIcon = doc.getElementById("cvBuddyIcon"); cvData.cvBuddyIcon = doc.getElementById("cvBuddyIcon");
cvData.cvListNameBox = doc.getElementById("cvListNameBox"); cvData.cvListNameBox = doc.getElementById("cvListNameBox");
cvData.cvListName = doc.getElementById("cvListName"); cvData.cvListName = doc.getElementById("cvListName");
cvData.cvEmail2Box = doc.getElementById("cvEmail2Box"); cvData.cvEmail2Box = doc.getElementById("cvEmail2Box");
cvData.cvEmail2 = doc.getElementById("cvEmail2"); cvData.cvEmail2 = doc.getElementById("cvEmail2");
// Home section // Home section
cvData.cvbHome = doc.getElementById("cvbHome"); cvData.cvbHome = doc.getElementById("cvbHome");
cvData.cvhHome = doc.getElementById("cvhHome"); cvData.cvhHome = doc.getElementById("cvhHome");
cvData.cvHomeAddress = doc.getElementById("cvHomeAddress"); cvData.cvHomeAddress = doc.getElementById("cvHomeAddress");
cvData.cvHomeAddress2 = doc.getElementById("cvHomeAddress2"); cvData.cvHomeAddress2 = doc.getElementById("cvHomeAddress2");
cvData.cvHomeCityStZip = doc.getElementById("cvHomeCityStZip"); cvData.cvHomeCityStZip = doc.getElementById("cvHomeCityStZip");
cvData.cvHomeCountry = doc.getElementById("cvHomeCountry"); cvData.cvHomeCountry = doc.getElementById("cvHomeCountry");
cvData.cvbHomeMapItBox = doc.getElementById("cvbHomeMapItBox"); cvData.cvbHomeMapItBox = doc.getElementById("cvbHomeMapItBox");
cvData.cvHomeMapIt = doc.getElementById("cvHomeMapIt"); cvData.cvHomeMapIt = doc.getElementById("cvHomeMapIt");
cvData.cvHomeWebPageBox = doc.getElementById("cvHomeWebPageBox"); cvData.cvHomeWebPageBox = doc.getElementById("cvHomeWebPageBox");
cvData.cvHomeWebPage = doc.getElementById("cvHomeWebPage"); cvData.cvHomeWebPage = doc.getElementById("cvHomeWebPage");
// Other section // Other section
cvData.cvbOther = doc.getElementById("cvbOther"); cvData.cvbOther = doc.getElementById("cvbOther");
cvData.cvhOther = doc.getElementById("cvhOther"); cvData.cvhOther = doc.getElementById("cvhOther");
cvData.cvCustom1 = doc.getElementById("cvCustom1"); cvData.cvCustom1 = doc.getElementById("cvCustom1");
cvData.cvCustom2 = doc.getElementById("cvCustom2"); cvData.cvCustom2 = doc.getElementById("cvCustom2");
cvData.cvCustom3 = doc.getElementById("cvCustom3"); cvData.cvCustom3 = doc.getElementById("cvCustom3");
cvData.cvCustom4 = doc.getElementById("cvCustom4"); cvData.cvCustom4 = doc.getElementById("cvCustom4");
cvData.cvNotes = doc.getElementById("cvNotes"); cvData.cvNotes = doc.getElementById("cvNotes");
// Description section (mailing lists only) // Description section (mailing lists only)
cvData.cvbDescription = doc.getElementById("cvbDescription"); cvData.cvbDescription = doc.getElementById("cvbDescription");
cvData.cvhDescription = doc.getElementById("cvhDescription"); cvData.cvhDescription = doc.getElementById("cvhDescription");
cvData.cvDescription = doc.getElementById("cvDescription"); cvData.cvDescription = doc.getElementById("cvDescription");
// Addresses section (mailing lists only) // Addresses section (mailing lists only)
cvData.cvbAddresses = doc.getElementById("cvbAddresses"); cvData.cvbAddresses = doc.getElementById("cvbAddresses");
cvData.cvhAddresses = doc.getElementById("cvhAddresses"); cvData.cvhAddresses = doc.getElementById("cvhAddresses");
cvData.cvAddresses = doc.getElementById("cvAddresses"); cvData.cvAddresses = doc.getElementById("cvAddresses");
// Phone section // Phone section
cvData.cvbPhone = doc.getElementById("cvbPhone"); cvData.cvbPhone = doc.getElementById("cvbPhone");
cvData.cvhPhone = doc.getElementById("cvhPhone"); cvData.cvhPhone = doc.getElementById("cvhPhone");
cvData.cvPhWork = doc.getElementById("cvPhWork"); cvData.cvPhWork = doc.getElementById("cvPhWork");
cvData.cvPhHome = doc.getElementById("cvPhHome"); cvData.cvPhHome = doc.getElementById("cvPhHome");
cvData.cvPhFax = doc.getElementById("cvPhFax"); cvData.cvPhFax = doc.getElementById("cvPhFax");
cvData.cvPhCellular = doc.getElementById("cvPhCellular"); cvData.cvPhCellular = doc.getElementById("cvPhCellular");
cvData.cvPhPager = doc.getElementById("cvPhPager"); cvData.cvPhPager = doc.getElementById("cvPhPager");
// Work section // Work section
cvData.cvbWork = doc.getElementById("cvbWork"); cvData.cvbWork = doc.getElementById("cvbWork");
cvData.cvhWork = doc.getElementById("cvhWork"); cvData.cvhWork = doc.getElementById("cvhWork");
cvData.cvJobTitle = doc.getElementById("cvJobTitle"); cvData.cvJobTitle = doc.getElementById("cvJobTitle");
cvData.cvDepartment = doc.getElementById("cvDepartment"); cvData.cvDepartment = doc.getElementById("cvDepartment");
cvData.cvCompany = doc.getElementById("cvCompany"); cvData.cvCompany = doc.getElementById("cvCompany");
cvData.cvWorkAddress = doc.getElementById("cvWorkAddress"); cvData.cvWorkAddress = doc.getElementById("cvWorkAddress");
cvData.cvWorkAddress2 = doc.getElementById("cvWorkAddress2"); cvData.cvWorkAddress2 = doc.getElementById("cvWorkAddress2");
cvData.cvWorkCityStZip = doc.getElementById("cvWorkCityStZip"); cvData.cvWorkCityStZip = doc.getElementById("cvWorkCityStZip");
cvData.cvWorkCountry = doc.getElementById("cvWorkCountry"); cvData.cvWorkCountry = doc.getElementById("cvWorkCountry");
cvData.cvbWorkMapItBox = doc.getElementById("cvbWorkMapItBox"); cvData.cvbWorkMapItBox = doc.getElementById("cvbWorkMapItBox");
cvData.cvWorkMapIt = doc.getElementById("cvWorkMapIt"); cvData.cvWorkMapIt = doc.getElementById("cvWorkMapIt");
cvData.cvWorkWebPageBox = doc.getElementById("cvWorkWebPageBox"); cvData.cvWorkWebPageBox = doc.getElementById("cvWorkWebPageBox");
cvData.cvWorkWebPage = doc.getElementById("cvWorkWebPage"); cvData.cvWorkWebPage = doc.getElementById("cvWorkWebPage");
} }
// XXX todo // XXX todo
@ -250,48 +250,48 @@ function DisplayCardViewPane(card)
visible = hasScreenName || visible; visible = hasScreenName || visible;
visible = HandleLink(data.cvEmail2, zSecondaryEmail, card.secondEmail, data.cvEmail2Box, "mailto:" + card.secondEmail) || visible; visible = HandleLink(data.cvEmail2, zSecondaryEmail, card.secondEmail, data.cvEmail2Box, "mailto:" + card.secondEmail) || visible;
// Home section // Home section
visible = cvSetNode(data.cvHomeAddress, card.homeAddress); visible = cvSetNode(data.cvHomeAddress, card.homeAddress);
visible = cvSetNode(data.cvHomeAddress2, card.homeAddress2) || visible; visible = cvSetNode(data.cvHomeAddress2, card.homeAddress2) || visible;
visible = cvSetCityStateZip(data.cvHomeCityStZip, card.homeCity, card.homeState, card.homeZipCode) || visible; visible = cvSetCityStateZip(data.cvHomeCityStZip, card.homeCity, card.homeState, card.homeZipCode) || visible;
visible = cvSetNode(data.cvHomeCountry, card.homeCountry) || visible; visible = cvSetNode(data.cvHomeCountry, card.homeCountry) || visible;
if (visible) { if (visible) {
var homeMapItUrl = CreateMapItURL(card.homeAddress, card.homeAddress2, card.homeCity, card.homeState, card.homeZipCode, card.homeCountry); var homeMapItUrl = CreateMapItURL(card.homeAddress, card.homeAddress2, card.homeCity, card.homeState, card.homeZipCode, card.homeCountry);
if (homeMapItUrl) { if (homeMapItUrl) {
cvSetVisible(data.cvbHomeMapItBox, true); cvSetVisible(data.cvbHomeMapItBox, true);
data.cvHomeMapIt.setAttribute('url', homeMapItUrl); data.cvHomeMapIt.setAttribute('url', homeMapItUrl);
} }
else { else {
cvSetVisible(data.cvbHomeMapItBox, false); cvSetVisible(data.cvbHomeMapItBox, false);
} }
} }
else { else {
cvSetVisible(data.cvbHomeMapItBox, false); cvSetVisible(data.cvbHomeMapItBox, false);
} }
visible = HandleLink(data.cvHomeWebPage, "", card.webPage2, data.cvHomeWebPageBox, card.webPage2) || visible; visible = HandleLink(data.cvHomeWebPage, "", card.webPage2, data.cvHomeWebPageBox, card.webPage2) || visible;
cvSetVisible(data.cvhHome, visible); cvSetVisible(data.cvhHome, visible);
cvSetVisible(data.cvbHome, visible); cvSetVisible(data.cvbHome, visible);
if (card.isMailList) { if (card.isMailList) {
// Description section // Description section
visible = cvSetNode(data.cvDescription, card.notes) visible = cvSetNode(data.cvDescription, card.notes)
cvSetVisible(data.cvbDescription, visible); cvSetVisible(data.cvbDescription, visible);
// Addresses section // Addresses section
visible = cvAddAddressNodes(data.cvAddresses, card.mailListURI); visible = cvAddAddressNodes(data.cvAddresses, card.mailListURI);
cvSetVisible(data.cvbAddresses, visible); cvSetVisible(data.cvbAddresses, visible);
// Other section, not shown for mailing lists. // Other section, not shown for mailing lists.
cvSetVisible(data.cvbOther, false); cvSetVisible(data.cvbOther, false);
} }
else { else {
// Other section // Other section
visible = cvSetNodeWithLabel(data.cvCustom1, zCustom1, card.custom1); visible = cvSetNodeWithLabel(data.cvCustom1, zCustom1, card.custom1);
visible = cvSetNodeWithLabel(data.cvCustom2, zCustom2, card.custom2) || visible; visible = cvSetNodeWithLabel(data.cvCustom2, zCustom2, card.custom2) || visible;
visible = cvSetNodeWithLabel(data.cvCustom3, zCustom3, card.custom3) || visible; visible = cvSetNodeWithLabel(data.cvCustom3, zCustom3, card.custom3) || visible;
visible = cvSetNodeWithLabel(data.cvCustom4, zCustom4, card.custom4) || visible; visible = cvSetNodeWithLabel(data.cvCustom4, zCustom4, card.custom4) || visible;
visible = cvSetNode(data.cvNotes, card.notes) || visible; visible = cvSetNode(data.cvNotes, card.notes) || visible;
visible = setBuddyIcon(card, data.cvBuddyIcon) || visible; visible = setBuddyIcon(card, data.cvBuddyIcon) || visible;
cvSetVisible(data.cvhOther, visible); cvSetVisible(data.cvhOther, visible);
@ -304,46 +304,46 @@ function DisplayCardViewPane(card)
cvSetVisible(data.cvbAddresses, false); cvSetVisible(data.cvbAddresses, false);
} }
// Phone section // Phone section
visible = cvSetNodeWithLabel(data.cvPhWork, zWork, card.workPhone); visible = cvSetNodeWithLabel(data.cvPhWork, zWork, card.workPhone);
visible = cvSetNodeWithLabel(data.cvPhHome, zHome, card.homePhone) || visible; visible = cvSetNodeWithLabel(data.cvPhHome, zHome, card.homePhone) || visible;
visible = cvSetNodeWithLabel(data.cvPhFax, zFax, card.faxNumber) || visible; visible = cvSetNodeWithLabel(data.cvPhFax, zFax, card.faxNumber) || visible;
visible = cvSetNodeWithLabel(data.cvPhCellular, zCellular, card.cellularNumber) || visible; visible = cvSetNodeWithLabel(data.cvPhCellular, zCellular, card.cellularNumber) || visible;
visible = cvSetNodeWithLabel(data.cvPhPager, zPager, card.pagerNumber) || visible; visible = cvSetNodeWithLabel(data.cvPhPager, zPager, card.pagerNumber) || visible;
cvSetVisible(data.cvhPhone, visible); cvSetVisible(data.cvhPhone, visible);
cvSetVisible(data.cvbPhone, visible); cvSetVisible(data.cvbPhone, visible);
// Work section // Work section
visible = cvSetNode(data.cvJobTitle, card.jobTitle); visible = cvSetNode(data.cvJobTitle, card.jobTitle);
visible = cvSetNode(data.cvDepartment, card.department) || visible; visible = cvSetNode(data.cvDepartment, card.department) || visible;
visible = cvSetNode(data.cvCompany, card.company) || visible; visible = cvSetNode(data.cvCompany, card.company) || visible;
var addressVisible = cvSetNode(data.cvWorkAddress, card.workAddress); var addressVisible = cvSetNode(data.cvWorkAddress, card.workAddress);
addressVisible = cvSetNode(data.cvWorkAddress2, card.workAddress2) || addressVisible; addressVisible = cvSetNode(data.cvWorkAddress2, card.workAddress2) || addressVisible;
addressVisible = cvSetCityStateZip(data.cvWorkCityStZip, card.workCity, card.workState, card.workZipCode) || addressVisible; addressVisible = cvSetCityStateZip(data.cvWorkCityStZip, card.workCity, card.workState, card.workZipCode) || addressVisible;
addressVisible = cvSetNode(data.cvWorkCountry, card.workCountry) || addressVisible; addressVisible = cvSetNode(data.cvWorkCountry, card.workCountry) || addressVisible;
if (addressVisible) { if (addressVisible) {
var workMapItUrl = CreateMapItURL(card.workAddress, card.workAddress2, card.workCity, card.workState, card.workZipCode, card.workCountry); var workMapItUrl = CreateMapItURL(card.workAddress, card.workAddress2, card.workCity, card.workState, card.workZipCode, card.workCountry);
data.cvWorkMapIt.setAttribute('url', workMapItUrl); data.cvWorkMapIt.setAttribute('url', workMapItUrl);
if (workMapItUrl) { if (workMapItUrl) {
cvSetVisible(data.cvbWorkMapItBox, true); cvSetVisible(data.cvbWorkMapItBox, true);
data.cvWorkMapIt.setAttribute('url', workMapItUrl); data.cvWorkMapIt.setAttribute('url', workMapItUrl);
} }
else { else {
cvSetVisible(data.cvbWorkMapItBox, false); cvSetVisible(data.cvbWorkMapItBox, false);
} }
} }
else { else {
cvSetVisible(data.cvbWorkMapItBox, false); cvSetVisible(data.cvbWorkMapItBox, false);
} }
visible = HandleLink(data.cvWorkWebPage, "", card.webPage1, data.cvWorkWebPageBox, card.webPage1) || addressVisible || visible; visible = HandleLink(data.cvWorkWebPage, "", card.webPage1, data.cvWorkWebPageBox, card.webPage1) || addressVisible || visible;
cvSetVisible(data.cvhWork, visible); cvSetVisible(data.cvhWork, visible);
cvSetVisible(data.cvbWork, visible); cvSetVisible(data.cvbWork, visible);
// make the card view box visible // make the card view box visible
cvSetVisible(top.cvData.CardViewBox, true); cvSetVisible(top.cvData.CardViewBox, true);
} }
function setBuddyIcon(card, buddyIcon) function setBuddyIcon(card, buddyIcon)
@ -383,7 +383,7 @@ function setBuddyIcon(card, buddyIcon)
function ClearCardViewPane() function ClearCardViewPane()
{ {
cvSetVisible(top.cvData.CardViewBox, false); cvSetVisible(top.cvData.CardViewBox, false);
} }
function cvSetNodeWithLabel(node, label, text) function cvSetNodeWithLabel(node, label, text)
@ -400,52 +400,52 @@ function cvSetNodeWithLabel(node, label, text)
function cvSetCityStateZip(node, city, state, zip) function cvSetCityStateZip(node, city, state, zip)
{ {
var text = ""; var text = "";
if ( city ) if ( city )
{ {
text = city; text = city;
if ( state || zip ) if ( state || zip )
text += ", "; text += ", ";
} }
if ( state ) if ( state )
text += state + " "; text += state + " ";
if ( zip ) if ( zip )
text += zip; text += zip;
return cvSetNode(node, text); return cvSetNode(node, text);
} }
function cvSetNode(node, text) function cvSetNode(node, text)
{ {
if ( node ) if ( node )
{ {
if ( !node.hasChildNodes() ) if ( !node.hasChildNodes() )
{ {
var textNode = document.createTextNode(text); var textNode = document.createTextNode(text);
node.appendChild(textNode); node.appendChild(textNode);
} }
else if ( node.childNodes.length == 1 ) else if ( node.childNodes.length == 1 )
node.childNodes[0].nodeValue = text; node.childNodes[0].nodeValue = text;
var visible; var visible;
if ( text ) if ( text )
visible = true; visible = true;
else else
visible = false; visible = false;
cvSetVisible(node, visible); cvSetVisible(node, visible);
} }
return visible; return visible;
} }
function cvAddAddressNodes(node, uri) function cvAddAddressNodes(node, uri)
{ {
var visible = false; var visible = false;
if ( node ) if ( node )
{ {
var displayName = ""; var displayName = "";
var address = ""; var address = "";
@ -459,7 +459,7 @@ function cvAddAddressNodes(node, uri)
node.removeChild(node.lastChild); node.removeChild(node.lastChild);
} }
for (i = 0; i < total; i++ ) { for (i = 0; i < total; i++ ) {
var descNode = document.createElement("description"); var descNode = document.createElement("description");
address = addressList.GetElementAt(i).QueryInterface(Components.interfaces.nsIAbCard).primaryEmail; address = addressList.GetElementAt(i).QueryInterface(Components.interfaces.nsIAbCard).primaryEmail;
displayName = addressList.GetElementAt(i).QueryInterface(Components.interfaces.nsIAbCard).displayName; displayName = addressList.GetElementAt(i).QueryInterface(Components.interfaces.nsIAbCard).displayName;
descNode.setAttribute("class", "CardViewLink"); descNode.setAttribute("class", "CardViewLink");
@ -473,20 +473,20 @@ function cvAddAddressNodes(node, uri)
var textNode = document.createTextNode(displayName + " <" + address + ">"); var textNode = document.createTextNode(displayName + " <" + address + ">");
linkNode.appendChild(textNode); linkNode.appendChild(textNode);
} }
visible = true; visible = true;
} }
} }
cvSetVisible(node, visible); cvSetVisible(node, visible);
} }
return visible; return visible;
} }
function cvSetVisible(node, visible) function cvSetVisible(node, visible)
{ {
if ( visible ) if ( visible )
node.removeAttribute("collapsed"); node.removeAttribute("collapsed");
else else
node.setAttribute("collapsed", "true"); node.setAttribute("collapsed", "true");
} }
function HandleLink(node, label, value, box, link) function HandleLink(node, label, value, box, link)

6
mozilla/mail/components/addrbook/content/abCommon.js
View File

@ -862,9 +862,9 @@ function goNewCardDialog(selectedAB)
function goEditCardDialog(abURI, card, okCallback) function goEditCardDialog(abURI, card, okCallback)
{ {
window.openDialog("chrome://messenger/content/addressbook/abEditCardDialog.xul", window.openDialog("chrome://messenger/content/addressbook/abEditCardDialog.xul",
"", "",
"chrome,resizable=no,modal,titlebar,centerscreen", "chrome,resizable=no,modal,titlebar,centerscreen",
{abURI:abURI, card:card, okCallback:okCallback}); {abURI:abURI, card:card, okCallback:okCallback});
} }

2
mozilla/mail/components/addrbook/content/abContactsPanel.xul
View File

@ -117,7 +117,7 @@
</menupopup> </menupopup>
</button> </button>
</textbox> </textbox>
</vbox> </vbox>
<separator class="thin"/> <separator class="thin"/>

88
mozilla/mail/components/addrbook/content/addressbook.js
View File

@ -177,7 +177,7 @@ function delayedOnLoadAddressBook()
{ {
gSearchInput = document.getElementById("searchInput"); gSearchInput = document.getElementById("searchInput");
verifyAccounts(null); // this will do migration, if we need to. verifyAccounts(null); // this will do migration, if we need to.
top.addressbook = Components.classes["@mozilla.org/addressbook;1"].createInstance(Components.interfaces.nsIAddressBook); top.addressbook = Components.classes["@mozilla.org/addressbook;1"].createInstance(Components.interfaces.nsIAddressBook);
@ -238,31 +238,31 @@ function OnLoadDirTree() {
function GetCurrentPrefs() function GetCurrentPrefs()
{ {
// prefs // prefs
if ( cvPrefs == 0 ) if ( cvPrefs == 0 )
cvPrefs = new Object; cvPrefs = new Object;
cvPrefs.prefs = gPrefs; cvPrefs.prefs = gPrefs;
// check "Show Name As" menu item based on pref // check "Show Name As" menu item based on pref
var menuitemID; var menuitemID;
switch (gPrefs.getIntPref("mail.addr_book.lastnamefirst")) switch (gPrefs.getIntPref("mail.addr_book.lastnamefirst"))
{ {
case kFirstNameFirst: case kFirstNameFirst:
menuitemID = 'firstLastCmd'; menuitemID = 'firstLastCmd';
break; break;
case kLastNameFirst: case kLastNameFirst:
menuitemID = 'lastFirstCmd'; menuitemID = 'lastFirstCmd';
break; break;
case kDisplayName: case kDisplayName:
default: default:
menuitemID = 'displayNameCmd'; menuitemID = 'displayNameCmd';
break; break;
} }
var menuitem = top.document.getElementById(menuitemID); var menuitem = top.document.getElementById(menuitemID);
if ( menuitem ) if ( menuitem )
menuitem.setAttribute('checked', 'true'); menuitem.setAttribute('checked', 'true');
// initialize phonetic // initialize phonetic
var showPhoneticFields = var showPhoneticFields =
@ -278,22 +278,22 @@ function GetCurrentPrefs()
function SetNameColumn(cmd) function SetNameColumn(cmd)
{ {
var prefValue; var prefValue;
switch ( cmd ) switch ( cmd )
{ {
case 'firstLastCmd': case 'firstLastCmd':
prefValue = kFirstNameFirst; prefValue = kFirstNameFirst;
break; break;
case 'lastFirstCmd': case 'lastFirstCmd':
prefValue = kLastNameFirst; prefValue = kLastNameFirst;
break; break;
case 'displayNameCmd': case 'displayNameCmd':
prefValue = kDisplayName; prefValue = kDisplayName;
break; break;
} }
cvPrefs.prefs.setIntPref("mail.addr_book.lastnamefirst", prefValue); cvPrefs.prefs.setIntPref("mail.addr_book.lastnamefirst", prefValue);
} }
function onFileMenuInit() function onFileMenuInit()
@ -475,8 +475,8 @@ function AbPrintAddressBookInternal(doPrintPreview, msgType)
return; return;
var statusFeedback; var statusFeedback;
statusFeedback = Components.classes["@mozilla.org/messenger/statusfeedback;1"].createInstance(); statusFeedback = Components.classes["@mozilla.org/messenger/statusfeedback;1"].createInstance();
statusFeedback = statusFeedback.QueryInterface(Components.interfaces.nsIMsgStatusFeedback); statusFeedback = statusFeedback.QueryInterface(Components.interfaces.nsIMsgStatusFeedback);
/* /*
turn "moz-abmdbdirectory://abook.mab" into turn "moz-abmdbdirectory://abook.mab" into
@ -490,12 +490,12 @@ function AbPrintAddressBookInternal(doPrintPreview, msgType)
gPrintSettings = PrintUtils.getPrintSettings(); gPrintSettings = PrintUtils.getPrintSettings();
} }
printEngineWindow = window.openDialog("chrome://messenger/content/msgPrintEngine.xul", printEngineWindow = window.openDialog("chrome://messenger/content/msgPrintEngine.xul",
"", "",
"chrome,dialog=no,all", "chrome,dialog=no,all",
1, [printUrl], statusFeedback, gPrintSettings, doPrintPreview, msgType); 1, [printUrl], statusFeedback, gPrintSettings, doPrintPreview, msgType);
return; return;
} }
function AbPrintAddressBook() function AbPrintAddressBook()

14
mozilla/mail/components/compose/content/addressingWidgetOverlay.js
View File

@ -556,10 +556,10 @@ function awAppendNewRow(setFocus)
//this copies the autocomplete sessions list from recipient#1 //this copies the autocomplete sessions list from recipient#1
input[0].syncSessions(document.getElementById('addressCol2#1')); input[0].syncSessions(document.getElementById('addressCol2#1'));
// also clone the showCommentColumn setting // also clone the showCommentColumn setting
// //
input[0].showCommentColumn = input[0].showCommentColumn =
document.getElementById("addressCol2#1").showCommentColumn; document.getElementById("addressCol2#1").showCommentColumn;
// We always clone the first row. The problem is that the first row // We always clone the first row. The problem is that the first row
// could be focused. When we clone that row, we end up with a cloned // could be focused. When we clone that row, we end up with a cloned
@ -852,17 +852,17 @@ function awRecipientErrorCommand(errItem, element)
try try
{ {
var specificError = errItem.param.QueryInterface(Components.interfaces.nsISupportsString); var specificError = errItem.param.QueryInterface(Components.interfaces.nsISupportsString);
specificErrString = specificError.data; specificErrString = specificError.data;
} catch (ex) } catch (ex)
{} {}
if (specificErrString == "") if (specificErrString == "")
specificErrString = "Internal error"; specificErrString = "Internal error";
if (gPromptService) if (gPromptService)
gPromptService.alert(window, generalErrString, specificErrString); gPromptService.alert(window, generalErrString, specificErrString);
else else
window.alert(generalErrString + ": " + specificErrString); window.alert(generalErrString + ": " + specificErrString);
} }
function awRecipientKeyPress(event, element) function awRecipientKeyPress(event, element)

2
mozilla/mail/components/migration/content/migration.js
View File

@ -118,7 +118,7 @@ var MigrationWizard = {
var firstNonDisabled = null; var firstNonDisabled = null;
for (var i = 0; i < group.childNodes.length; ++i) { for (var i = 0; i < group.childNodes.length; ++i) {
if (!group.childNodes[i].hidden) { if (!group.childNodes[i].hidden) {
firstNonDisabled = group.childNodes[i]; firstNonDisabled = group.childNodes[i];
break; break;
} }

7
mozilla/mail/components/phishing/application.js
View File

@ -70,3 +70,10 @@ function PROT_Application() {
PROT_Application.prototype.getReportPhishingURL = function() { PROT_Application.prototype.getReportPhishingURL = function() {
return gDataProvider.getReportPhishURL(); return gDataProvider.getReportPhishURL();
} }
/**
* @return String the report error URL (localized).
*/
PROT_Application.prototype.getReportErrorURL = function() {
return gDataProvider.getReportErrorURL();
}

2
mozilla/mail/components/preferences/privacy.js
View File

@ -97,7 +97,7 @@ var gPrivacyPane = {
// otherwise go ahead and remove the training data // otherwise go ahead and remove the training data
var junkmailPlugin = Components.classes["@mozilla.org/messenger/filter-plugin;1?name=bayesianfilter"] var junkmailPlugin = Components.classes["@mozilla.org/messenger/filter-plugin;1?name=bayesianfilter"]
.getService(Components.interfaces.nsIJunkMailPlugin); .getService(Components.interfaces.nsIJunkMailPlugin);
if (junkmailPlugin) if (junkmailPlugin)
junkmailPlugin.resetTrainingData(); junkmailPlugin.resetTrainingData();

2
mozilla/mail/extensions/newsblog/content/FeedItem.js
View File

@ -240,7 +240,7 @@ FeedItem.prototype =
if (!folder) if (!folder)
{ {
debug(this.feed.name + " folder doesn't exist; creating"); debug(this.feed.name + " folder doesn't exist; creating");
debug("creating " + this.feed.name + "as child of " + server.rootMsgFolder + "\n"); debug("creating " + this.feed.name + "as child of " + server.rootMsgFolder + "\n");
server.rootMsgFolder.createSubfolder(this.feed.name, null /* supposed to be a msg window */); server.rootMsgFolder.createSubfolder(this.feed.name, null /* supposed to be a msg window */);
folder = server.rootMsgFolder.FindSubFolder(this.feed.name); folder = server.rootMsgFolder.FindSubFolder(this.feed.name);
debug(this.identity + " not stored (folder didn't exist)"); debug(this.identity + " not stored (folder didn't exist)");

2
mozilla/mail/extensions/newsblog/content/feed-properties.xul
View File

@ -110,7 +110,7 @@
IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure" IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType" ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
label="rdf:http://home.netscape.com/NC-rdf#Name"> label="rdf:http://home.netscape.com/NC-rdf#Name">
<menupopup class="menulist-menupopup"> <menupopup class="menulist-menupopup">
<menuitem label="&choosethisfolder.label;" <menuitem label="&choosethisfolder.label;"
oncommand="PickedMsgFolder(event.target.parentNode.parentNode,'selectFolder')"/> oncommand="PickedMsgFolder(event.target.parentNode.parentNode,'selectFolder')"/>
<menuseparator/> <menuseparator/>

4
mozilla/mail/extensions/newsblog/content/utils.js
View File

@ -121,7 +121,7 @@ function addFeed(url, title, destFolder)
ds.Assert(id, DC_IDENTIFIER, rdf.GetLiteral(url), true); ds.Assert(id, DC_IDENTIFIER, rdf.GetLiteral(url), true);
if (title) if (title)
ds.Assert(id, DC_TITLE, rdf.GetLiteral(title), true); ds.Assert(id, DC_TITLE, rdf.GetLiteral(title), true);
ds.Assert(id, FZ_DESTFOLDER, destFolder, true); ds.Assert(id, FZ_DESTFOLDER, destFolder, true);
ds = ds.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource); ds = ds.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
ds.Flush(); ds.Flush();
} }
@ -182,7 +182,7 @@ function getRDFTargetValue(ds, source, property)
}catch(e){ }catch(e){
// if the RDF was bogus, do nothing. rethrow if it's some other problem // if the RDF was bogus, do nothing. rethrow if it's some other problem
if(!((e instanceof Components.interfaces.nsIXPCException) if(!((e instanceof Components.interfaces.nsIXPCException)
&& (e.result==Components.results.NS_ERROR_NO_INTERFACE))) && (e.result==Components.results.NS_ERROR_NO_INTERFACE)))
throw e; throw e;
} }