From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 browser/components/preferences/dialogs/addEngine.js  |  2 +-
 browser/components/preferences/dialogs/blocklists.js | 14 +++++++-------
 .../components/preferences/dialogs/clearSiteData.js  |  2 +-
 browser/components/preferences/dialogs/colors.xhtml  | 10 ++++++++--
 browser/components/preferences/dialogs/connection.js | 10 ++++++++++
 .../components/preferences/dialogs/connection.xhtml  | 14 +++++++++++++-
 browser/components/preferences/dialogs/containers.js |  4 ++--
 .../components/preferences/dialogs/dohExceptions.js  |  1 -
 browser/components/preferences/dialogs/fonts.xhtml   |  4 +++-
 .../preferences/dialogs/translationExceptions.js     | 20 ++++++++++----------
 .../components/preferences/dialogs/translations.js   | 20 ++++++++++----------
 11 files changed, 65 insertions(+), 36 deletions(-)

(limited to 'browser/components/preferences/dialogs')

diff --git a/browser/components/preferences/dialogs/addEngine.js b/browser/components/preferences/dialogs/addEngine.js
index 1faf8622b3..6b9d8f663b 100644
--- a/browser/components/preferences/dialogs/addEngine.js
+++ b/browser/components/preferences/dialogs/addEngine.js
@@ -26,7 +26,7 @@ let gAddEngineDialog = {
     document.addEventListener("dialogaccept", this.onAddEngine.bind(this));
   },
 
-  async onAddEngine(event) {
+  async onAddEngine() {
     let url = document
       .getElementById("engineUrl")
       .value.replace(/%s/, "{searchTerms}");
diff --git a/browser/components/preferences/dialogs/blocklists.js b/browser/components/preferences/dialogs/blocklists.js
index c28ee09f96..89e21c476f 100644
--- a/browser/components/preferences/dialogs/blocklists.js
+++ b/browser/components/preferences/dialogs/blocklists.js
@@ -26,28 +26,28 @@ var gBlocklistManager = {
       return "";
     },
 
-    isSeparator(index) {
+    isSeparator() {
       return false;
     },
     isSorted() {
       return false;
     },
-    isContainer(index) {
+    isContainer() {
       return false;
     },
-    setTree(tree) {},
-    getImageSrc(row, column) {},
+    setTree() {},
+    getImageSrc() {},
     getCellValue(row, column) {
       if (column.id == "selectionCol") {
         return gBlocklistManager._blockLists[row].selected;
       }
       return undefined;
     },
-    cycleHeader(column) {},
-    getRowProperties(row) {
+    cycleHeader() {},
+    getRowProperties() {
       return "";
     },
-    getColumnProperties(column) {
+    getColumnProperties() {
       return "";
     },
     getCellProperties(row, column) {
diff --git a/browser/components/preferences/dialogs/clearSiteData.js b/browser/components/preferences/dialogs/clearSiteData.js
index 061534b52a..664ad114fa 100644
--- a/browser/components/preferences/dialogs/clearSiteData.js
+++ b/browser/components/preferences/dialogs/clearSiteData.js
@@ -58,7 +58,7 @@ var gClearSiteDataDialog = {
     );
   },
 
-  onCheckboxCommand(event) {
+  onCheckboxCommand() {
     this._dialog.setAttribute(
       "buttondisabledaccept",
       !(this._clearSiteDataCheckbox.checked || this._clearCacheCheckbox.checked)
diff --git a/browser/components/preferences/dialogs/colors.xhtml b/browser/components/preferences/dialogs/colors.xhtml
index 1720cf3498..3181dd5c6d 100644
--- a/browser/components/preferences/dialogs/colors.xhtml
+++ b/browser/components/preferences/dialogs/colors.xhtml
@@ -41,7 +41,11 @@
 
     <hbox>
       <groupbox flex="1">
-        <label><html:h2 data-l10n-id="colors-text-and-background" /></label>
+        <label
+          ><html:h2
+            class="heading-medium"
+            data-l10n-id="colors-text-and-background"
+        /></label>
         <hbox align="center">
           <label
             data-l10n-id="colors-text-header"
@@ -74,7 +78,9 @@
       </groupbox>
 
       <groupbox flex="1">
-        <label><html:h2 data-l10n-id="colors-links-header" /></label>
+        <label
+          ><html:h2 class="heading-medium" data-l10n-id="colors-links-header"
+        /></label>
         <hbox align="center">
           <label
             data-l10n-id="colors-unvisited-links"
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");
diff --git a/browser/components/preferences/dialogs/connection.xhtml b/browser/components/preferences/dialogs/connection.xhtml
index 2a1a3c0115..bb9a932033 100644
--- a/browser/components/preferences/dialogs/connection.xhtml
+++ b/browser/components/preferences/dialogs/connection.xhtml
@@ -63,7 +63,11 @@
     </hbox>
 
     <groupbox>
-      <label><html:h2 data-l10n-id="connection-proxy-configure" /></label>
+      <label
+        ><html:h2
+          class="heading-medium"
+          data-l10n-id="connection-proxy-configure"
+      /></label>
 
       <radiogroup id="networkProxyType" preference="network.proxy.type">
         <radio value="0" data-l10n-id="connection-proxy-option-no" />
@@ -74,6 +78,14 @@
           id="systemPref"
           hidden="true"
         />
+        <checkbox
+          value="true"
+          data-l10n-id="connection-proxy-option-wpad"
+          id="systemWpad"
+          hidden="true"
+          preference="network.proxy.system_wpad"
+          class="indent"
+        />
         <radio value="1" data-l10n-id="connection-proxy-option-manual" />
         <box id="proxy-grid" class="indent" flex="1">
           <html:div class="proxy-grid-row">
diff --git a/browser/components/preferences/dialogs/containers.js b/browser/components/preferences/dialogs/containers.js
index 14526545b6..87368689a0 100644
--- a/browser/components/preferences/dialogs/containers.js
+++ b/browser/components/preferences/dialogs/containers.js
@@ -88,7 +88,7 @@ let gContainersManager = {
     this._dialog.setAttribute("buttondisabledaccept", !name.value.trim());
   },
 
-  createIconButtons(defaultIcon) {
+  createIconButtons() {
     let radiogroup = document.createXULElement("radiogroup");
     radiogroup.setAttribute("id", "icon");
     radiogroup.className = "icon-buttons radio-buttons";
@@ -116,7 +116,7 @@ let gContainersManager = {
     return radiogroup;
   },
 
-  createColorSwatches(defaultColor) {
+  createColorSwatches() {
     let radiogroup = document.createXULElement("radiogroup");
     radiogroup.setAttribute("id", "color");
     radiogroup.className = "radio-buttons";
diff --git a/browser/components/preferences/dialogs/dohExceptions.js b/browser/components/preferences/dialogs/dohExceptions.js
index f4c1d4d80d..9bf64bd4ed 100644
--- a/browser/components/preferences/dialogs/dohExceptions.js
+++ b/browser/components/preferences/dialogs/dohExceptions.js
@@ -31,7 +31,6 @@ var gDoHExceptionsManager = {
       "network.trr.excluded-domains"
     );
 
-    this._btnAddException.disabled = this._prefLocked;
     document.getElementById("exceptionDialog").getButton("accept").disabled =
       this._prefLocked;
     this._urlField.disabled = this._prefLocked;
diff --git a/browser/components/preferences/dialogs/fonts.xhtml b/browser/components/preferences/dialogs/fonts.xhtml
index 44dc473ccb..cd35371324 100644
--- a/browser/components/preferences/dialogs/fonts.xhtml
+++ b/browser/components/preferences/dialogs/fonts.xhtml
@@ -43,7 +43,9 @@
     <groupbox>
       <hbox align="center">
         <label control="selectLangs"
-          ><html:h2 data-l10n-id="fonts-langgroup-header"
+          ><html:h2
+            class="heading-medium"
+            data-l10n-id="fonts-langgroup-header"
         /></label>
       </hbox>
       <menulist id="selectLangs" preference="font.language.group">
diff --git a/browser/components/preferences/dialogs/translationExceptions.js b/browser/components/preferences/dialogs/translationExceptions.js
index 27579594c9..a83f7a3de1 100644
--- a/browser/components/preferences/dialogs/translationExceptions.js
+++ b/browser/components/preferences/dialogs/translationExceptions.js
@@ -46,29 +46,29 @@ Tree.prototype = {
   get rowCount() {
     return this._data.length;
   },
-  getCellText(aRow, aColumn) {
+  getCellText(aRow) {
     return this._data[aRow];
   },
-  isSeparator(aIndex) {
+  isSeparator() {
     return false;
   },
   isSorted() {
     return false;
   },
-  isContainer(aIndex) {
+  isContainer() {
     return false;
   },
-  setTree(aTree) {},
-  getImageSrc(aRow, aColumn) {},
-  getCellValue(aRow, aColumn) {},
-  cycleHeader(column) {},
-  getRowProperties(row) {
+  setTree() {},
+  getImageSrc() {},
+  getCellValue() {},
+  cycleHeader() {},
+  getRowProperties() {
     return "";
   },
-  getColumnProperties(column) {
+  getColumnProperties() {
     return "";
   },
-  getCellProperties(row, column) {
+  getCellProperties() {
     return "";
   },
   QueryInterface: ChromeUtils.generateQI(["nsITreeView"]),
diff --git a/browser/components/preferences/dialogs/translations.js b/browser/components/preferences/dialogs/translations.js
index 826e6efb4b..7af2412b44 100644
--- a/browser/components/preferences/dialogs/translations.js
+++ b/browser/components/preferences/dialogs/translations.js
@@ -60,29 +60,29 @@ Tree.prototype = {
   get rowCount() {
     return this._data.length;
   },
-  getCellText(aRow, aColumn) {
+  getCellText(aRow) {
     return this._data[aRow];
   },
-  isSeparator(aIndex) {
+  isSeparator() {
     return false;
   },
   isSorted() {
     return false;
   },
-  isContainer(aIndex) {
+  isContainer() {
     return false;
   },
-  setTree(aTree) {},
-  getImageSrc(aRow, aColumn) {},
-  getCellValue(aRow, aColumn) {},
-  cycleHeader(column) {},
-  getRowProperties(row) {
+  setTree() {},
+  getImageSrc() {},
+  getCellValue() {},
+  cycleHeader() {},
+  getRowProperties() {
     return "";
   },
-  getColumnProperties(column) {
+  getColumnProperties() {
     return "";
   },
-  getCellProperties(row, column) {
+  getCellProperties() {
     return "";
   },
   QueryInterface: ChromeUtils.generateQI(["nsITreeView"]),
-- 
cgit v1.2.3