зеркало из https://github.com/mozilla/pjs.git
Merge for backout of changeset 93928936b1ab / bug 382690
This commit is contained in:
Коммит
10c4fe9dff
|
@ -369,7 +369,6 @@ function ShowPrefs()
|
||||||
configTree.controllers.insertControllerAt(0, configController);
|
configTree.controllers.insertControllerAt(0, configController);
|
||||||
|
|
||||||
document.getElementById("configDeck").setAttribute("selectedIndex", 1);
|
document.getElementById("configDeck").setAttribute("selectedIndex", 1);
|
||||||
document.getElementById("configTreeKeyset").removeAttribute("disabled");
|
|
||||||
if (!document.getElementById("showWarningNextTime").checked)
|
if (!document.getElementById("showWarningNextTime").checked)
|
||||||
gPrefBranch.setBoolPref("general.warnOnAboutConfig", false);
|
gPrefBranch.setBoolPref("general.warnOnAboutConfig", false);
|
||||||
|
|
||||||
|
|
|
@ -76,10 +76,9 @@
|
||||||
<menuitem id="resetSelected" label="&reset.label;" accesskey="&reset.accesskey;" oncommand="ResetSelected();"/>
|
<menuitem id="resetSelected" label="&reset.label;" accesskey="&reset.accesskey;" oncommand="ResetSelected();"/>
|
||||||
</popup>
|
</popup>
|
||||||
|
|
||||||
<keyset id="configTreeKeyset" disabled="true">
|
<keyset>
|
||||||
<key keycode="VK_ENTER" oncommand="ModifySelected();"/>
|
<key keycode="VK_ENTER" oncommand="ModifySelected();"/>
|
||||||
<key keycode="VK_RETURN" oncommand="ModifySelected();"/>
|
<key keycode="VK_RETURN" oncommand="ModifySelected();"/>
|
||||||
<key key="&focusFilter.key;" modifiers="accel" oncommand="document.getElementById('textbox').focus();"/>
|
|
||||||
</keyset>
|
</keyset>
|
||||||
<deck id="configDeck" flex="1">
|
<deck id="configDeck" flex="1">
|
||||||
<vbox id="warningScreen" flex="1" align="center">
|
<vbox id="warningScreen" flex="1" align="center">
|
||||||
|
|
|
@ -45,7 +45,6 @@
|
||||||
|
|
||||||
<!ENTITY filterPrefs.label "Filter:">
|
<!ENTITY filterPrefs.label "Filter:">
|
||||||
<!ENTITY filterPrefs.accesskey "F">
|
<!ENTITY filterPrefs.accesskey "F">
|
||||||
<!ENTITY focusFilter.key "f">
|
|
||||||
|
|
||||||
<!-- Columns -->
|
<!-- Columns -->
|
||||||
<!ENTITY prefColumn.label "Preference Name">
|
<!ENTITY prefColumn.label "Preference Name">
|
||||||
|
|
Загрузка…
Ссылка в новой задаче