bug 134935 - Collapse and Expand in History context menu share the same accesskey entry, r=dean_tessman, sr=dmose, checking in for piersc@cogs.susx.ac.uk
git-svn-id: svn://10.0.0.236/trunk@138178 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -417,10 +417,14 @@ function updateItems()
|
||||
bookmarkItem.setAttribute("hidden", "true");
|
||||
copyLocationItem.setAttribute("hidden", "true");
|
||||
sep1.setAttribute("hidden", "true");
|
||||
if (isContainerOpen(gHistoryTree, currentIndex))
|
||||
if (isContainerOpen(gHistoryTree, currentIndex)) {
|
||||
collapseExpandItem.setAttribute("label", gHistoryBundle.getString("collapseLabel"));
|
||||
else
|
||||
collapseExpandItem.setAttribute("accesskey", gHistoryBundle.getString("collapseAccesskey"));
|
||||
}
|
||||
else {
|
||||
collapseExpandItem.setAttribute("label", gHistoryBundle.getString("expandLabel"));
|
||||
collapseExpandItem.setAttribute("accesskey", gHistoryBundle.getString("expandAccesskey"));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
collapseExpandItem.setAttribute("hidden", "true");
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<command id="cmd_delete"/>
|
||||
<command id="cmd_selectAll"/>
|
||||
<popup id="historyMenu" onpopupshowing="return updateItems();">
|
||||
<menuitem id="miCollapseExpand" accesskey="&collapseExpand.accesskey;" oncommand="collapseExpand();"/>
|
||||
<menuitem id="miCollapseExpand" oncommand="collapseExpand();"/>
|
||||
<menuitem id="miOpen" label="&openLinkInWindowCmd.label;" accesskey="&openLinkInWindowCmd.accesskey;" default="true"
|
||||
oncommand="OpenURL(false);"/>
|
||||
<menuitem id="miOpenInNewWindow" label="&openLinkCmd.label;" accesskey="&openLinkCmd.accesskey;"
|
||||
|
||||
@@ -15,4 +15,5 @@ search_results_title=Search Results
|
||||
|
||||
collapseLabel=Collapse
|
||||
expandLabel=Expand
|
||||
collapseExpandAccesskey=e
|
||||
collapseAccesskey=C
|
||||
expandAccesskey=x
|
||||
|
||||
@@ -12,4 +12,3 @@
|
||||
<!ENTITY tree.header.hostname.akey "H">
|
||||
<!ENTITY tree.header.visitcount.label "Visit Count">
|
||||
<!ENTITY tree.header.visitcount.akey "V">
|
||||
<!ENTITY collapseExpand.accesskey "e">
|
||||
|
||||
Reference in New Issue
Block a user