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

Bug 1610423 - stop graying out socks settings when sharing http/ftp/tls proxy settings, r=mkaply,jaws

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D60855

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Gijs Kruitbosch 2020-02-06 19:09:36 +00:00
parent f6a013abd2
commit d4a84f8008
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -289,13 +289,12 @@ var gConnectionsDialog = {
proxyServerURLPref.updateElements(); proxyServerURLPref.updateElements();
proxyPortPref.updateElements(); proxyPortPref.updateElements();
proxyServerURLPref.disabled = let prefIsShared = proxyPrefs[i] != "socks" && shareProxiesPref.value;
proxyTypePref.value != 1 || shareProxiesPref.value; proxyServerURLPref.disabled = proxyTypePref.value != 1 || prefIsShared;
proxyPortPref.disabled = proxyServerURLPref.disabled; proxyPortPref.disabled = proxyServerURLPref.disabled;
} }
var socksVersionPref = Preferences.get("network.proxy.socks_version"); var socksVersionPref = Preferences.get("network.proxy.socks_version");
socksVersionPref.disabled = socksVersionPref.disabled = proxyTypePref.value != 1;
proxyTypePref.value != 1 || shareProxiesPref.value;
this.updateDNSPref(); this.updateDNSPref();
return undefined; return undefined;
}, },