diff --git a/assets/patches.txt b/assets/patches.txt index 94c1403..02e83fe 100644 --- a/assets/patches.txt +++ b/assets/patches.txt @@ -10,6 +10,7 @@ patches/sed-patches/allow-searchengines-non-esr.patch patches/sed-patches/disable-pocket.patch patches/sed-patches/remove-internal-plugin-certs.patch patches/sed-patches/stop-undesired-requests2.patch +patches/ui-patches/handlers.patch patches/ui-patches/hide-default-browser.patch patches/ui-patches/pref-naming.patch patches/ui-patches/privacy-preferences.patch diff --git a/patches/ui-patches/handlers.patch b/patches/ui-patches/handlers.patch new file mode 100644 index 0000000..2916500 --- /dev/null +++ b/patches/ui-patches/handlers.patch @@ -0,0 +1,232 @@ +--- a/uriloader/exthandler/HandlerList.jsm ++++ b/uriloader/exthandler/HandlerList.jsm +@@ -13,228 +13,7 @@ this.kHandlerList = { + schemes: { + mailto: { + handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- cs: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Seznam", +- uriTemplate: "https://email.seznam.cz/newMessageScreen?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- csb: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Poczta Interia.pl", +- uriTemplate: "http://poczta.interia.pl/mh/?mailto=%s", +- }, +- { +- name: "OnetPoczta", +- uriTemplate: "http://poczta.onet.pl/napisz.html?uri=%s", +- }, +- ], +- }, +- }, +- }, +- "es-CL": { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "Outlook", +- uriTemplate: +- "https://outlook.live.com/default.aspx?rru=compose&to=%s", +- }, +- ], +- }, +- }, +- }, +- "ja-JP-mac": { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Yahoo!メール", +- uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- ja: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Yahoo!メール", +- uriTemplate: "https://mail.yahoo.co.jp/compose/?To=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- kk: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Яндекс.Почта", +- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- ltg: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "inbox.lv mail", +- uriTemplate: "https://mail.inbox.lv/compose?to=%s", +- }, +- ], +- }, +- }, +- }, +- lv: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "inbox.lv mail", +- uriTemplate: "https://mail.inbox.lv/compose?to=%s", +- }, +- ], +- }, +- }, +- }, +- pl: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Poczta Interia.pl", +- uriTemplate: "https://poczta.interia.pl/mh/?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- ru: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Яндекс.Почту", +- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- ], +- }, +- }, +- }, +- sah: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Яндекс.Почта", +- uriTemplate: "https://mail.yandex.ru/compose?mailto=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, +- ], +- }, +- }, +- }, +- uk: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "Outlook", +- uriTemplate: +- "https://outlook.live.com/default.aspx?rru=compose&to=%s", +- }, +- ], +- }, +- }, +- }, +- uz: { +- schemes: { +- mailto: { +- handlers: [ +- { +- name: "Gmail", +- uriTemplate: "https://mail.google.com/mail/?extsrc=mailto&url=%s", +- }, +- { +- name: "Mail.Ru", +- uriTemplate: "https://e.mail.ru/cgi-bin/sentmsg?mailto=%s", +- }, ++ {}, + ], + }, + }, diff --git a/patches/ui-patches/remap-links.patch b/patches/ui-patches/remap-links.patch index 5d052f6..dbc7cc1 100644 --- a/patches/ui-patches/remap-links.patch +++ b/patches/ui-patches/remap-links.patch @@ -1,21 +1,47 @@ --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -312,6 +312,14 @@ var gMainPane = { - "performance"; +@@ -309,11 +309,19 @@ var gMainPane = { + ); + let performanceSettingsUrl = + Services.urlFormatter.formatURLPref("app.support.baseURL") + +- "performance"; ++ "https://support.mozilla.org/en-US/kb/performance-settings"; performanceSettingsLink.setAttribute("href", performanceSettingsUrl); + this.updateDefaultPerformanceSettingsPref(); + + let sessionRestoreLink = document.getElementById( + "sessionRestoreLearnMore" + ); + let sessionRestoreUrl = + Services.urlFormatter.formatURLPref("app.support.baseURL") + + "why-is-session-restore-not-working"; -+ sessionRestoreLink.setAttribute("href", sessionRestoreUrl); ++ sessionRestoreLink.setAttribute("href", sessionRestoreUrl); + - this.updateDefaultPerformanceSettingsPref(); - let defaultPerformancePref = Preferences.get( -@@ -543,7 +551,7 @@ var gMainPane = { + "browser.preferences.defaultPerformanceSettings.enabled" + ); +@@ -357,8 +365,7 @@ var gMainPane = { + document.getElementById("pictureInPictureBox").hidden = false; + + let pipLearnMoreUrl = +- Services.urlFormatter.formatURLPref("app.support.baseURL") + +- "picture-in-picture"; ++ "https://support.mozilla.org/en-US/kb/turn-picture-picture-mode"; + let link = document.getElementById("pictureInPictureLearnMore"); + link.setAttribute("href", pipLearnMoreUrl); + } +@@ -509,8 +516,7 @@ var gMainPane = { + ) { + document.getElementById("mediaControlBox").hidden = false; + let mediaControlLearnMoreUrl = +- Services.urlFormatter.formatURLPref("app.support.baseURL") + +- "media-keyboard-control"; ++ "https://support.mozilla.org/en-US/kb/control-audio-or-video-playback-your-keyboard"; + let link = document.getElementById("mediaControlLearnMore"); + link.setAttribute("href", mediaControlLearnMoreUrl); + } +@@ -543,7 +549,7 @@ var gMainPane = { let drmInfoURL = Services.urlFormatter.formatURLPref("app.support.baseURL") + @@ -24,7 +50,7 @@ document .getElementById("playDRMContentLink") .setAttribute("href", drmInfoURL); -@@ -870,7 +878,8 @@ var gMainPane = { +@@ -870,7 +876,8 @@ var gMainPane = { const link = document.getElementById("browserContainersLearnMore"); link.href = @@ -34,9 +60,10 @@ document.getElementById("browserContainersbox").hidden = false; this.readBrowserContainersCheckbox(); + --- a/browser/components/preferences/privacy.js +++ b/browser/components/preferences/privacy.js -@@ -283,7 +283,7 @@ function setUpContentBlockingWarnings() +@@ -283,7 +283,7 @@ function setUpContentBlockingWarnings() { let links = document.querySelectorAll(".contentBlockWarningLink"); let contentBlockingWarningUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + @@ -63,7 +90,7 @@ breachAlertsLearnMoreLink.setAttribute("href", breachAlertsLearnMoreUrl); this._initSafeBrowsing(); -@@ -751,7 +751,7 @@ var gPrivacyPane = { +@@ -751,11 +751,12 @@ var gPrivacyPane = { ); let url = Services.urlFormatter.formatURLPref("app.support.baseURL") + @@ -72,7 +99,13 @@ document.getElementById("siteDataLearnMoreLink").setAttribute("href", url); let notificationInfoURL = -@@ -924,7 +924,7 @@ var gPrivacyPane = { +- Services.urlFormatter.formatURLPref("app.support.baseURL") + "push"; ++ Services.urlFormatter.formatURLPref("app.support.baseURL") + ++ "how-do-i-enable-push-notifications"; + document + .getElementById("notificationPermissionsLearnMore") + .setAttribute("href", notificationInfoURL); +@@ -924,7 +925,7 @@ var gPrivacyPane = { let link = document.getElementById("contentBlockingLearnMore"); let contentBlockingUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + @@ -81,7 +114,7 @@ link.setAttribute("href", contentBlockingUrl); // Toggles the text "Cross-site and social media trackers" based on the -@@ -2276,7 +2276,7 @@ var gPrivacyPane = { +@@ -2276,7 +2277,7 @@ var gPrivacyPane = { let learnMoreLink = document.getElementById("primaryPasswordLearnMoreLink"); let learnMoreURL = Services.urlFormatter.formatURLPref("app.support.baseURL") + @@ -90,7 +123,7 @@ learnMoreLink.setAttribute("href", learnMoreURL); }, -@@ -2474,7 +2474,7 @@ var gPrivacyPane = { +@@ -2474,7 +2475,7 @@ var gPrivacyPane = { let learnMoreLink = document.getElementById("enableSafeBrowsingLearnMore"); let phishingUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") +