diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /browser/components/preferences/dialogs/connection.js | |
parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/preferences/dialogs/connection.js')
-rw-r--r-- | browser/components/preferences/dialogs/connection.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/browser/components/preferences/dialogs/connection.js b/browser/components/preferences/dialogs/connection.js index 0b21b1b5a5..33e8deb279 100644 --- a/browser/components/preferences/dialogs/connection.js +++ b/browser/components/preferences/dialogs/connection.js @@ -16,6 +16,7 @@ Preferences.addAll([ // both initialized when network.proxy.type initialization triggers a call to // gConnectionsDialog.updateReloadButton(). { id: "network.proxy.autoconfig_url", type: "string" }, + { id: "network.proxy.system_wpad", type: "bool" }, { id: "network.proxy.type", type: "int" }, { id: "network.proxy.http", type: "string" }, { id: "network.proxy.http_port", type: "int" }, @@ -130,11 +131,20 @@ var gConnectionsDialog = { checkForSystemProxy() { if ("@mozilla.org/system-proxy-settings;1" in Cc) { document.getElementById("systemPref").removeAttribute("hidden"); + + var systemWpadAllowed = Preferences.get( + "network.proxy.system_wpad.allowed" + ); + if (systemWpadAllowed && Services.appinfo.OS == "WINNT") { + document.getElementById("systemWpad").removeAttribute("hidden"); + } } }, proxyTypeChanged() { var proxyTypePref = Preferences.get("network.proxy.type"); + var systemWpadPref = Preferences.get("network.proxy.system_wpad"); + systemWpadPref.updateControlDisabledState(proxyTypePref.value != 5); // Update http var httpProxyURLPref = Preferences.get("network.proxy.http"); |