Merge for backout of changeset 93928936b1ab / bug 382690

This commit is contained in:
Mark Banner 2008-09-28 15:55:25 +01:00
commit 3cda67e4eb
3 changed files with 1 additions and 4 deletions

View File

@ -369,7 +369,6 @@ function ShowPrefs()
configTree.controllers.insertControllerAt(0, configController);
document.getElementById("configDeck").setAttribute("selectedIndex", 1);
document.getElementById("configTreeKeyset").removeAttribute("disabled");
if (!document.getElementById("showWarningNextTime").checked)
gPrefBranch.setBoolPref("general.warnOnAboutConfig", false);

View File

@ -76,10 +76,9 @@
<menuitem id="resetSelected" label="&reset.label;" accesskey="&reset.accesskey;" oncommand="ResetSelected();"/>
</popup>
<keyset id="configTreeKeyset" disabled="true">
<keyset>
<key keycode="VK_ENTER" oncommand="ModifySelected();"/>
<key keycode="VK_RETURN" oncommand="ModifySelected();"/>
<key key="&focusFilter.key;" modifiers="accel" oncommand="document.getElementById('textbox').focus();"/>
</keyset>
<deck id="configDeck" flex="1">
<vbox id="warningScreen" flex="1" align="center">

View File

@ -45,7 +45,6 @@
<!ENTITY filterPrefs.label "Filter:">
<!ENTITY filterPrefs.accesskey "F">
<!ENTITY focusFilter.key "f">
<!-- Columns -->
<!ENTITY prefColumn.label "Preference Name">