Bug 1133355 - The Properties button and context menuitem should be disabled when multiple cards are selected. r=IanN sr=Mnyromyr a=IanN for comm-aurora and comm-beta
--- a/suite/mailnews/addrbook/addressbook-panel.xul
+++ b/suite/mailnews/addrbook/addressbook-panel.xul
@@ -34,31 +34,32 @@
<script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
<script type="application/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
<script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook-panel.js"/>
<script type="application/javascript"
src="chrome://communicator/content/utilityOverlay.js"/>
<commandset id="addressbook-panel-commandset">
<command id="cmd_newlist" oncommand="AbNewList();"/>
+ <command id="cmd_properties" oncommand="goDoCommand('cmd_properties');"/>
</commandset>
<menupopup id="composeMail" onpopupshowing="CommandUpdate_AddressBook();">
<menuitem label="&toButton.label;" accesskey="&toButton.accesskey;" oncommand="AbPanelAdd('addr_to');" default="true"/>
<menuitem label="&ccButton.label;" accesskey="&ccButton.accesskey;" oncommand="AbPanelAdd('addr_cc');"/>
<menuitem label="&bccButton.label;" accesskey="&bccButton.accesskey;" oncommand="AbPanelAdd('addr_bcc');"/>
<menuseparator/>
<menuitem label="&composeEmail.label;" accesskey="&composeEmail.accesskey;" oncommand="AbNewMessage();" default="true"/>
<menuitem label="©Address.label;" accesskey="©Address.accesskey;" oncommand="AbCopyAddress();"/>
<menuitem label="&deleteAddrBookCard.label;" accesskey="&deleteAddrBookCard.accesskey;" oncommand="AbDelete();"/>
<menuseparator/>
<menuitem label="&newAddrBookCard.label;" accesskey="&newAddrBookCard.accesskey;" oncommand="AbPanelNewCard();"/>
<menuitem label="&newAddrBookMailingList.label;" accesskey="&newAddrBookMailingList.accesskey;" command="cmd_newlist"/>
<menuseparator/>
- <menuitem label="&addrBookCardProperties.label;" accesskey="&addrBookCardProperties.accesskey;" oncommand="AbEditSelectedCard();"/>
+ <menuitem label="&addrBookCardProperties.label;" accesskey="&addrBookCardProperties.accesskey;" command="cmd_properties"/>
</menupopup>
<vbox id="results_box" flex="1">
<hbox id="panel-bar" class="toolbar" align="center">
<label value="&lookIn.label;" control="addressbookList" id="lookInLabel"/>
<menulist id="addressbookList"
oncommand="DirPaneSelectionChangeMenulist();" flex="1"
persist="value">
<menupopup id="addressbookList-menupopup" class="addrbooksPopup"/>
--- a/suite/mailnews/addrbook/addressbook.js
+++ b/suite/mailnews/addrbook/addressbook.js
@@ -141,16 +141,17 @@ function SetNameColumn(cmd)
Services.prefs.setIntPref(kPrefMailAddrBookLastNameFirst, prefValue);
}
function CommandUpdate_AddressBook()
{
goUpdateCommand('cmd_delete');
goUpdateCommand('button_delete');
+ goUpdateCommand('cmd_properties');
goUpdateCommand('cmd_newlist');
}
function ResultsPaneSelectionChanged()
{
UpdateCardView();
}