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

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

--HG--
extra : moz-landing-system : lando

browser/components/preferences/connection.js

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