henry pushed to branch mullvad-browser-150.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: e66c38ce by Henry Wilkes at 2026-05-06T15:59:20+01:00 fixup! BB 42583: Modify moz-support-link for Base Browser. BB 44903: Use upstream's `support-page` rather than custom `tor-manual-page`. - - - - - 03b4921f by Henry Wilkes at 2026-05-06T15:59:24+01:00 fixup! BB 41916: Letterboxing preferences UI BB 44903: Use upstream's `support-page` rather than custom `tor-manual-page`. - - - - - e73539d1 by Henry Wilkes at 2026-05-06T15:59:26+01:00 fixup! BB 40925: Implemented the Security Level component BB 44903: Use upstream's `support-page` rather than custom `tor-manual-page`. - - - - - 4 changed files: - browser/components/preferences/letterboxing.inc.xhtml - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml - toolkit/content/widgets/moz-support-link/moz-support-link.mjs Changes: ===================================== browser/components/preferences/letterboxing.inc.xhtml ===================================== @@ -10,7 +10,7 @@ <html:span data-l10n-id="letterboxing-overview"></html:span> <html:a is="moz-support-link" - tor-manual-page="anti-fingerprinting_letterboxing" + support-page="tor-manual:anti-fingerprinting_letterboxing" data-l10n-id="letterboxing-learn-more" ></html:a> </description> ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -18,7 +18,7 @@ <html:a is="moz-support-link" id="securityLevel-learnMore" - tor-manual-page="security-settings" + support-page="tor-manual:security-settings" data-l10n-id="security-level-panel-learn-more-link" ></html:a> <html:img id="securityLevel-background-image" alt="" /> ===================================== browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml ===================================== @@ -13,7 +13,7 @@ ></html:span> <html:a is="moz-support-link" - tor-manual-page="security-settings" + support-page="tor-manual:security-settings" data-l10n-id="security-level-preferences-learn-more-link" ></html:a> </description> ===================================== toolkit/content/widgets/moz-support-link/moz-support-link.mjs ===================================== @@ -17,9 +17,7 @@ window.MozXULElement?.insertFTLIfNeeded("toolkit/global/mozSupportLink.ftl"); export default class MozSupportLink extends HTMLAnchorElement { static SUPPORT_URL = "https://www.mozilla.org/"; static get observedAttributes() { - // We add tor-manual-page for pages hosted at tor project. Also shared with - // base-browser/mullvad-browser. See tor-browser#42583. - return ["support-page", "utm-content", "tor-manual-page"]; + return ["support-page", "utm-content"]; } /** @@ -97,18 +95,18 @@ export default class MozSupportLink extends HTMLAnchorElement { } attributeChangedCallback(attrName) { - if ( - attrName === "support-page" || - attrName === "utm-content" || - attrName === "tor-manual-page" - ) { + if (attrName === "support-page" || attrName === "utm-content") { this.#setHref(); } } #setHref() { - let torManualPage = this.getAttribute("tor-manual-page"); - if (torManualPage) { + let supportPage = this.getAttribute("support-page") ?? ""; + // Support pages that start with "tor-manual:" are meant to point to the + // Tor Project's support pages. See tor-browser#44903. + const torManualPrefix = "tor-manual:"; + if (supportPage.startsWith(torManualPrefix)) { + const torManualPage = supportPage.substring(torManualPrefix.length); const [page, anchor] = torManualPage.split("_", 2); let locale = Services.locale.appLocaleAsBCP47; @@ -124,7 +122,6 @@ export default class MozSupportLink extends HTMLAnchorElement { this.href = href; return; } - let supportPage = this.getAttribute("support-page") ?? ""; // For base-browser we sometimes want to override firefox support links with // our own. // See tor-browser#40899. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7d2... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7d2... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help