Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 92e3821d85c2 (bug 449251) for bustage.

Browse Source
This commit is contained in:
Jason Duell 2012-06-20 19:11:04 -07:00
commit b04ee297c7
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
browser/components/preferences/connection.js
View File

@ -27,15 +27,8 @@ var gConnectionsDialog = {
var backupPortPref = document.getElementById("network.proxy.backup." + proxyPrefs[i] + "_port");
backupServerURLPref.value = proxyServerURLPref.value;
backupPortPref.value = proxyPortPref.value;
// SOCKS: not a protocol: set value to empty/0 while shareProxies is on
if (proxyPrefs[i] == "socks") {
proxyServerURLPref.value = "";
proxyPortPref.value = 0;
} else {
// protocols get HTTP proxy's values
proxyServerURLPref.value = httpProxyURLPref.value;
proxyPortPref.value = httpProxyPortPref.value;
}
proxyServerURLPref.value = httpProxyURLPref.value;
proxyPortPref.value = httpProxyPortPref.value;
}
}
@ -141,10 +134,6 @@ var gConnectionsDialog = {
{
var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
if (shareProxiesPref.value) {
// during shareProxiesPref SOCKS values are empty
if (aProtocol == 'socks') {
return aIsPort ? 0 : "";
}
var pref = document.getElementById("network.proxy.http" + (aIsPort ? "_port" : ""));
return pref.value;
}