Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug #65761 and #108606 -polishing prefill filters;r/sr=sspitzer

Browse Source
This commit is contained in:
varada%netscape.com 2001-11-06 22:55:37 +00:00
parent 26f0e8f362
commit 8798c93d1e
7 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mailnews/base/resources/content/mail3PaneWindowCommands.js
View File

@ -190,6 +190,7 @@ var DefaultController =
switch ( command )
{
case "cmd_createFilterFromPopup":
case "cmd_close":
case "cmd_reply":
case "button_reply":
@ -202,7 +203,7 @@ var DefaultController =
case "cmd_forwardInline":
case "cmd_forwardAttachment":
case "cmd_editAsNew":
case "cmd_canHaveFilter":
case "cmd_createFilterFromMenu":
case "cmd_delete":
case "button_delete":
case "cmd_shiftDelete":
@ -325,7 +326,11 @@ var DefaultController =
if ((GetNumSelectedMessages() == 1) && gDBView)
gDBView.getCommandStatus(nsMsgViewCommandType.toggleThreadWatched, enabled, checkStatus);
return enabled.value;
case "cmd_canHaveFilter":
case "cmd_createFilterFromPopup":
var loadedFolder = GetLoadedMsgFolder();
if (!(loadedFolder && loadedFolder.server.canHaveFilters))
return false;
case "cmd_createFilterFromMenu":
var loadedFolder = GetLoadedMsgFolder();
if (!(loadedFolder && loadedFolder.server.canHaveFilters) || !(IsMessageDisplayedInMessagePane()))
return false;
@ -493,9 +498,11 @@ var DefaultController =
case "cmd_editAsNew":
MsgEditMessageAsNew();
break;
case "cmd_canHaveFilter":
case "cmd_createFilterFromMenu":
MsgCreateFilter();
break;
case "cmd_createFilterFromPopup":
break;// This does nothing because the createfilter is invoked from the popupnode oncommand.
case "button_delete":
case "cmd_delete":
SetNextMessageAfterDelete();

4
mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
View File

@ -117,7 +117,7 @@ Rights Reserved.
<popup id="folderPaneContext"/>
<popup id="attachmentTreeContext"/>
<popup id="emailAddressPopup" popupanchor="bottomleft">
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
@ -130,7 +130,7 @@ Rights Reserved.
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_canHaveFilter"/>
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">

9
mailnews/base/resources/content/mailWindowOverlay.js
View File

@ -673,7 +673,7 @@ function MsgCreateFilter()
if (gCollapsedHeaderViewMode)
emailAddressNode = document.getElementById("collapsedfromValue");
else
emailAddressNode = document.getElementById("expandedfromValue");
emailAddressNode = document.getElementById("expandedfromBox").emailAddressNode;
if (emailAddressNode)
{
@ -988,7 +988,12 @@ function MsgFilters(emailAddress)
filterEditor.focus();
}
else
filterList.openPrefillOnExistingFilterList(emailAddress);
{
if(emailAddress)
filterList.openPrefillOnExistingFilterList(emailAddress);
else
filterList.focus();
}
}
else
window.openDialog("chrome://messenger/content/FilterListDialog.xul", "",

6
mailnews/base/resources/content/mailWindowOverlay.xul
View File

@ -84,6 +84,8 @@ Rights Reserved.
<command id="cmd_newNavigator"/>
<command id="cmd_newEditor"/>
<command id="cmd_quit"/>
<!--The cmd_createFilterFromPopup is used to notify the email context popup -->
<command id="cmd_createFilterFromPopup"/>
<!-- <command id="cmd_pageSetup"/>-->
</commandset>
<commandset id="mailViewMenuItems"
@ -182,7 +184,7 @@ Rights Reserved.
<command id="cmd_forwardInline" oncommand="goDoCommand('cmd_forwardInline')"/>
<command id="cmd_forwardAttachment" oncommand="goDoCommand('cmd_forwardAttachment')"/>
<command id="cmd_editAsNew" oncommand="goDoCommand('cmd_editAsNew')"/>
<command id="cmd_canHaveFilter" oncommand="goDoCommand('cmd_canHaveFilter')"/>
<command id="cmd_createFilterFromMenu" oncommand="goDoCommand('cmd_createFilterFromMenu')"/>
<command id="cmd_killThread" oncommand="goDoCommand('cmd_killThread')"/>
<command id="cmd_watchThread" oncommand="goDoCommand('cmd_watchThread')"/>
@ -1074,7 +1076,7 @@ Rights Reserved.
<menuseparator/>
<menuitem id="createFilter" label="&createFilter.label;"
accesskey="&createFilter.accesskey;"
observes="cmd_canHaveFilter"/>
observes="cmd_createFilterFromMenu"/>
<menuseparator/>
<menu label="&moveMsgMenu.label;" accesskey="&moveMsgMenu.accesskey;" id="moveMenu" datasources="rdf:null"
sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"

11
mailnews/base/resources/content/messageWindow.js
View File

@ -423,7 +423,8 @@ var MessageWindowController =
case "cmd_forwardInline":
case "cmd_forwardAttachment":
case "cmd_editAsNew":
case "cmd_canHaveFilter":
case "cmd_createFilterFromPopup":
case "cmd_createFilterFromMenu":
case "cmd_delete":
case "cmd_undo":
case "cmd_redo":
@ -492,11 +493,11 @@ var MessageWindowController =
gDBView.getCommandStatus(nsMsgViewCommandType.deleteMsg, enabled, checkStatus);
return enabled.value;
}
case "cmd_canHaveFilter":
case "cmd_createFilterFromPopup":
case "cmd_createFilterFromMenu":
var loadedFolder = GetLoadedMsgFolder();
if (!(loadedFolder && loadedFolder.server.canHaveFilters))
return false;
case "cmd_reply":
case "button_reply":
case "cmd_replySender":
@ -609,7 +610,9 @@ var MessageWindowController =
case "cmd_editAsNew":
MsgEditMessageAsNew();
break;
case "cmd_canHaveFilter":
case "cmd_createFilterFromPopup":
break;// This does nothing because the createfilter is invoked from the popupnode oncommand.
case "cmd_createFilterFromMenu":
MsgCreateFilter();
break;
case "cmd_delete":

4
mailnews/base/resources/content/messageWindow.xul
View File

@ -95,7 +95,7 @@ Rights Reserved.
</keyset>
<popupset>
<popup id="emailAddressPopup" popupanchor="bottomleft">
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
@ -108,7 +108,7 @@ Rights Reserved.
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_canHaveFilter"/>
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">

4
mailnews/base/resources/content/messenger.xul
View File

@ -121,7 +121,7 @@ Rights Reserved.
<popup id="attachmentTreeContext"/>
<popup id="attachmentTreeTooltip"/>
<popup id="emailAddressPopup" popupanchor="bottomleft">
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">
<menuitem label="&AddToAddressBook.label;"
accesskey="&AddToAddressBook.accesskey;"
oncommand="AddNodeToAddressBook(document.popupNode)"/>
@ -134,7 +134,7 @@ Rights Reserved.
<menuitem label="&CreateFilter.label;"
accesskey="&CreateFilter.accesskey;"
oncommand="CreateFilter(document.popupNode)"
observes="cmd_canHaveFilter"/>
observes="cmd_createFilterFromPopup"/>
</popup>
<popup id="allHeadersPopup" onpopupshowing="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">