Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for 39690, 22056, 36125. r=hyatt

Browse Source
This commit is contained in:
ben%netscape.com 2006-05-17 02:25:30 +00:00
parent 13660f41bf
commit e3893107ab
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
suite/common/pref/pref-appearance.xul
View File

@ -41,7 +41,7 @@
<![CDATA[
// the first elements in this array will be poked from chromeregistry loaded
// overlays once overlays.rdf works properly
_elementIDs = ["generalStartupBrowser", "generalStartupMail", "generalStartupEditor", "toolbarStyle"];
_elementIDs = ["generalStartupBrowser", "generalStartupMail", "generalStartupEditor", /*"toolbarStyle" */];
]]>
</script>
@ -74,7 +74,7 @@
</titledbox>
<!-- displaying none for beta -->
<titledbox id="toolbarStyleBox" orient="vertical">
<titledbox id="toolbarStyleBox" orient="vertical" style="display: none;">
<title><text value="&showToolsLegend.label;"/></title>
<radiogroup id="toolbarStyle" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"

4
suite/common/pref/pref-proxies.js
View File

@ -24,12 +24,14 @@ function DoEnabling()
var ftpPort = document.getElementById("networkProxyFTP_Port");
var http = document.getElementById("networkProxyHTTP");
var httpPort = document.getElementById("networkProxyHTTP_Port");
var ssl = document.getElementById("networkProxySSL");
var sslPort = document.getElementById("networkProxySSL_Port");
var noProxy = document.getElementById("networkProxyNone");
var autoURL = document.getElementById("networkProxyAutoconfigURL");
var autoReload = document.getElementById("autoReload");
// convenience arrays
var manual = [ftp, ftpPort, http, httpPort, noProxy];
var manual = [ftp, ftpPort, http, httpPort, ssl, sslPort, noProxy];
var auto = [autoURL, autoReload];
// radio buttons

12
suite/common/pref/pref-proxies.xul
View File

@ -32,7 +32,7 @@
<script language="JavaScript">
<![CDATA[
_elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
_elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
]]>
</script>
@ -78,6 +78,16 @@
prefattribute="value" size="5"/>
</box>
</row>
<row>
<text class="label" value="&ssl.label;" accesskey="&ssl.accesskey;" for="networkProxySSL"/>
<box autostretch="never">
<textfield id="networkProxySSL" pref="true" preftype="string" prefstring="network.proxy.ssl"
prefattribute="value" flex="1"/>
<text class="label" value="&port.label;" accesskey="&SSLport.accesskey;" for="networkProxySSL_Port"/>
<textfield id="networkProxySSL_Port" pref="true" preftype="int" prefstring="network.proxy.ssl_port"
prefattribute="value" size="5"/>
</box>
</row>
<row>
<text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
<textfield id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"