зеркало из https://github.com/mozilla/pjs.git
The rest of the fix for 77935 that I forgot last night. r=hewitt sr=alecf
This commit is contained in:
Родитель
ca81aa7e22
Коммит
fcc3ff0719
|
@ -38,6 +38,7 @@
|
|||
setCheck("cbxAutoFill", window.arguments[0]);
|
||||
setCheck("cbxShowPopup", window.arguments[1]);
|
||||
setCheck("cbxShowSearch", window.arguments[2]);
|
||||
setCheck("cbxMatchOnlyTyped", window.arguments[3]);
|
||||
|
||||
updateImage("AutoFill");
|
||||
updateImage("ShowPopup");
|
||||
|
@ -50,7 +51,8 @@
|
|||
{
|
||||
window.opener.receiveACPrefs(getCheck("cbxAutoFill"),
|
||||
getCheck("cbxShowPopup"),
|
||||
getCheck("cbxShowSearch"));
|
||||
getCheck("cbxShowSearch"),
|
||||
getCheck("cbxMatchOnlyTyped"));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -101,6 +103,7 @@
|
|||
oncommand="updateShowPopup(); updateImage('ShowPopup')"/>
|
||||
<checkbox id="cbxShowSearch" label="&autoCompleteShowSearch.label;"
|
||||
oncommand="updateImage('ShowSearch')"/>
|
||||
<checkbox id="cbxMatchOnlyTyped" label="&autoCompleteMatchOnlyTyped.label;"/>
|
||||
</vbox>
|
||||
</groupbox>
|
||||
|
||||
|
|
|
@ -173,14 +173,16 @@ function showACAdvanced()
|
|||
"modal=yes,chrome,resizable=no",
|
||||
document.getElementById("browserUrlbarAutoFill").getAttribute("value"),
|
||||
document.getElementById("browserUrlbarShowPopup").getAttribute("value"),
|
||||
document.getElementById("browserUrlbarShowSearch").getAttribute("value"));
|
||||
document.getElementById("browserUrlbarShowSearch").getAttribute("value"),
|
||||
document.getElementById("browserUrlbarMatchOnlyTyped").getAttribute("value"));
|
||||
}
|
||||
|
||||
function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch)
|
||||
function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch, aAutoType)
|
||||
{
|
||||
document.getElementById("browserUrlbarAutoFill").setAttribute("value", aAutoFill);
|
||||
document.getElementById("browserUrlbarShowPopup").setAttribute("value", aShowPopup);
|
||||
document.getElementById("browserUrlbarShowSearch").setAttribute("value", aShowSearch);
|
||||
document.getElementById("browserUrlbarMatchOnlyTyped").setAttribute("value", aAutoType);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -47,7 +47,8 @@
|
|||
|
||||
var _elementIDs = ["browserRelatedDisabledForDomains", "addDomain",
|
||||
"browserGoBrowsingEnabled", "browserAutoCompleteEnabled",
|
||||
"browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch"];
|
||||
"browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch",
|
||||
"browserUrlbarMatchOnlyTyped"];
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
@ -121,11 +122,13 @@
|
|||
oncommand="toggleAutoCompleteAdvancedButton()" flex="1"/>
|
||||
<button label="&autoCompleteAdvanced.label;" oncommand="showACAdvanced()" id="autoCompleteAdvancedButton"/>
|
||||
<data id="browserUrlbarAutoFill" preftype="bool" prefattribute="value"
|
||||
prefstring="browser.urlbar.autoFill"/>"
|
||||
prefstring="browser.urlbar.autoFill"/>
|
||||
<data id="browserUrlbarShowPopup" preftype="bool" prefattribute="value"
|
||||
prefstring="browser.urlbar.showPopup"/>"
|
||||
prefstring="browser.urlbar.showPopup"/>
|
||||
<data id="browserUrlbarShowSearch" preftype="bool" prefattribute="value"
|
||||
prefstring="browser.urlbar.showSearch"/>"
|
||||
prefstring="browser.urlbar.showSearch"/>
|
||||
<data id="browserUrlbarMatchOnlyTyped" preftype="bool" prefattribute="value"
|
||||
prefstring="browser.urlbar.matchOnlyTyped"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
</page>
|
||||
|
|
|
@ -38,5 +38,6 @@
|
|||
<!ENTITY autoCompleteAutoFill.label "Autocomplete best match as you type">
|
||||
<!ENTITY autoCompleteShowPopup.label "Show list of matching results">
|
||||
<!ENTITY autoCompleteShowSearch.label "Show internet search engine">
|
||||
<!ENTITY autoCompleteMatchOnlyTyped.label "Match only websites you've typed previously">
|
||||
<!ENTITY autocompletePreview.label "Preview">
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче