Fix 49934: gopher support, minor restructuring of directory viewer. necko: r=darin,dougt sr=rpotts other: r=waterson,mstoltz,jag sr=alecf

Fix 70404: assertionsf or datetime and finger. r=dougt, sr=rpotts

Both patches by Bradley Baetz (bbaetz@cs.mcgill.ca)
This commit is contained in:
blakeross%telocity.com 2006-05-17 02:28:43 +00:00
parent 15e1d9d67e
commit a226f2157d
3 changed files with 25 additions and 2 deletions

View File

@ -23,6 +23,8 @@ function DoEnabling()
var i; var i;
var ftp = document.getElementById("networkProxyFTP"); var ftp = document.getElementById("networkProxyFTP");
var ftpPort = document.getElementById("networkProxyFTP_Port"); var ftpPort = document.getElementById("networkProxyFTP_Port");
var gopher = document.getElementById("networkProxyGopher");
var gopherPort = document.getElementById("networkProxyGopher_Port");
var http = document.getElementById("networkProxyHTTP"); var http = document.getElementById("networkProxyHTTP");
var httpPort = document.getElementById("networkProxyHTTP_Port"); var httpPort = document.getElementById("networkProxyHTTP_Port");
var ssl = document.getElementById("networkProxySSL"); var ssl = document.getElementById("networkProxySSL");
@ -34,7 +36,7 @@ function DoEnabling()
var autoReload = document.getElementById("autoReload"); var autoReload = document.getElementById("autoReload");
// convenience arrays // convenience arrays
var manual = [ftp, ftpPort, http, httpPort, ssl, sslPort, socks, socksPort, noProxy]; var manual = [ftp, ftpPort, gopher, gopherPort, http, httpPort, ssl, sslPort, socks, socksPort, noProxy];
var auto = [autoURL, autoReload]; var auto = [autoURL, autoReload];
// radio buttons // radio buttons

View File

@ -35,7 +35,13 @@
<script type="application/x-javascript"> <script type="application/x-javascript">
<![CDATA[ <![CDATA[
var _elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxySOCKS", "networkProxySOCKS_Port", "networkProxyNone", "networkProxyAutoconfigURL"]; var _elementIDs = ["networkProxyType",
"networkProxyFTP", "networkProxyFTP_Port",
"networkProxyGopher", "networkProxyGopher_Port",
"networkProxyHTTP", "networkProxyHTTP_Port",
"networkProxySSL", "networkProxySSL_Port",
"networkProxySOCKS", "networkProxySOCKS_Port",
"networkProxyNone", "networkProxyAutoconfigURL"];
]]> ]]>
</script> </script>
@ -73,6 +79,17 @@
prefattribute="value" size="5"/> prefattribute="value" size="5"/>
</box> </box>
</row> </row>
<row>
<text class="label" value="&gopher.label;" accesskey="&gopher.accesskey;" for="networkProxyGopher"/>
<box autostretch="never">
<textfield id="networkProxyGopher" pref="true" preftype="string" prefstring="network.proxy.gopher"
prefattribute="value" flex="1"/>
<!-- gopher port doesn't have an accesskey because the window needs a redesign - bbaetz -->
<text class="label" value="&port.label;" accesskey="&gopherPort.accesskey;" for="networkProxyGopher_Port"/>
<textfield id="networkProxyGopher_Port" pref="true" preftype="int" prefstring="network.proxy.gopher_port"
prefattribute="value" size="5"/>
</box>
</row>
<row> <row>
<text class="label" value="&http.label;" accesskey="&http.accesskey;" for="networkProxyHTTP"/> <text class="label" value="&http.label;" accesskey="&http.accesskey;" for="networkProxyHTTP"/>
<box autostretch="never"> <box autostretch="never">

View File

@ -17,6 +17,8 @@
<!ENTITY reload.accesskey "l"> <!ENTITY reload.accesskey "l">
<!ENTITY ftp.label "FTP Proxy:"> <!ENTITY ftp.label "FTP Proxy:">
<!ENTITY ftp.accesskey "f"> <!ENTITY ftp.accesskey "f">
<!ENTITY gopher.label "Gopher Proxy:">
<!ENTITY gopher.accesskey "g">
<!ENTITY http.label "HTTP Proxy:"> <!ENTITY http.label "HTTP Proxy:">
<!ENTITY http.accesskey "h"> <!ENTITY http.accesskey "h">
<!ENTITY ssl.label "SSL Proxy:"> <!ENTITY ssl.label "SSL Proxy:">
@ -25,6 +27,8 @@
<!ENTITY socks.accesskey "c"> <!ENTITY socks.accesskey "c">
<!ENTITY port.label "Port:"> <!ENTITY port.label "Port:">
<!ENTITY FTPport.accesskey "p"> <!ENTITY FTPport.accesskey "p">
<!-- No accesskey for gopher (':' doesn't go well) - mpt's going to redesign the window -->
<!ENTITY gopherPort.accesskey "">
<!ENTITY HTTPport.accesskey "o"> <!ENTITY HTTPport.accesskey "o">
<!ENTITY SSLport.accesskey "r"> <!ENTITY SSLport.accesskey "r">
<!ENTITY SOCKSport.accesskey "t"> <!ENTITY SOCKSport.accesskey "t">