From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- browser/components/preferences/containers.js | 2 +- .../components/preferences/dialogs/addEngine.js | 2 +- .../components/preferences/dialogs/blocklists.js | 14 +- .../preferences/dialogs/clearSiteData.js | 2 +- .../components/preferences/dialogs/colors.xhtml | 10 +- .../components/preferences/dialogs/connection.js | 10 + .../preferences/dialogs/connection.xhtml | 14 +- .../components/preferences/dialogs/containers.js | 4 +- .../preferences/dialogs/dohExceptions.js | 1 - browser/components/preferences/dialogs/fonts.xhtml | 4 +- .../preferences/dialogs/translationExceptions.js | 20 +- .../components/preferences/dialogs/translations.js | 20 +- browser/components/preferences/findInPage.js | 43 +- browser/components/preferences/home.js | 18 +- browser/components/preferences/main.inc.xhtml | 13 +- browser/components/preferences/main.js | 26 +- browser/components/preferences/preferences.js | 9 +- browser/components/preferences/preferences.xhtml | 3 +- browser/components/preferences/privacy.inc.xhtml | 9 +- browser/components/preferences/privacy.js | 13 +- browser/components/preferences/search.js | 1121 +++++++++++--------- browser/components/preferences/sync.js | 2 +- browser/components/preferences/tests/browser.toml | 4 + .../preferences/tests/browser_about_settings.js | 29 + .../tests/browser_basic_rebuild_fonts_test.js | 2 +- .../tests/browser_browser_languages_subdialog.js | 20 +- .../preferences/tests/browser_cert_export.js | 2 +- .../preferences/tests/browser_connection.js | 2 +- .../tests/browser_connection_bug388287.js | 2 +- .../tests/browser_cookies_exceptions.js | 26 +- .../browser_dns_over_https_exceptions_subdialog.js | 185 ++++ .../components/preferences/tests/browser_fluent.js | 4 +- .../tests/browser_localSearchShortcuts.js | 4 +- .../tests/browser_permissions_urlFieldHidden.js | 2 +- .../preferences/tests/browser_proxy_backup.js | 2 +- .../tests/browser_searchChangedEngine.js | 11 + .../tests/browser_search_within_preferences_2.js | 84 ++ .../tests/browser_sync_chooseWhatToSync.js | 2 +- .../preferences/tests/browser_sync_pairing.js | 2 +- .../tests/browser_trendingsuggestions.js | 17 + browser/components/preferences/tests/head.js | 2 +- .../tests/siteData/browser_clearSiteData.js | 2 +- .../components/preferences/tests/siteData/head.js | 2 +- .../tests/siteData/service_worker_test.html | 2 +- .../components/preferences/translations.inc.xhtml | 7 +- 45 files changed, 1141 insertions(+), 634 deletions(-) create mode 100644 browser/components/preferences/tests/browser_about_settings.js create mode 100644 browser/components/preferences/tests/browser_dns_over_https_exceptions_subdialog.js (limited to 'browser/components/preferences') diff --git a/browser/components/preferences/containers.js b/browser/components/preferences/containers.js index 80d1ec7cc3..171fd47ce1 100644 --- a/browser/components/preferences/containers.js +++ b/browser/components/preferences/containers.js @@ -123,7 +123,7 @@ let gContainersPane = { this.openPreferenceDialog(button.getAttribute("value")); }, - onAddButtonCommand(button) { + onAddButtonCommand() { this.openPreferenceDialog(null); }, 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 @@ - +