[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-150.0a1-16.0-2] 3 commits: fixup! BB 42583: Modify moz-support-link for Base Browser.

Title: GitLab

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:

Changes:

  • browser/components/preferences/letterboxing.inc.xhtml
    ... ... @@ -10,7 +10,7 @@
    10 10 
         <html:span data-l10n-id="letterboxing-overview"></html:span>
    11 11 
         <html:a
    12 12 
           is="moz-support-link"
    13 
    -      tor-manual-page="anti-fingerprinting_letterboxing"
    13 
    +      support-page="tor-manual:anti-fingerprinting_letterboxing"
    14 14 
           data-l10n-id="letterboxing-learn-more"
    15 15 
         ></html:a>
    16 16 
       </description>

  • browser/components/securitylevel/content/securityLevelPanel.inc.xhtml
    ... ... @@ -18,7 +18,7 @@
    18 18 
         <html:a
    19 19 
           is="moz-support-link"
    20 20 
           id="securityLevel-learnMore"
    21 
    -      tor-manual-page="security-settings"
    21 
    +      support-page="tor-manual:security-settings"
    22 22 
           data-l10n-id="security-level-panel-learn-more-link"
    23 23 
         ></html:a>
    24 24 
         <html:img id="securityLevel-background-image" alt="" />

  • browser/components/securitylevel/content/securityLevelPreferences.inc.xhtml
    ... ... @@ -13,7 +13,7 @@
    13 13 
           ></html:span>
    14 14 
           <html:a
    15 15 
             is="moz-support-link"
    16 
    -        tor-manual-page="security-settings"
    16 
    +        support-page="tor-manual:security-settings"
    17 17 
             data-l10n-id="security-level-preferences-learn-more-link"
    18 18 
           ></html:a>
    19 19 
         </description>

  • toolkit/content/widgets/moz-support-link/moz-support-link.mjs
    ... ... @@ -17,9 +17,7 @@ window.MozXULElement?.insertFTLIfNeeded("toolkit/global/mozSupportLink.ftl");
    17 17 
     export default class MozSupportLink extends HTMLAnchorElement {
    18 18 
       static SUPPORT_URL = "https://www.mozilla.org/";
    19 19 
       static get observedAttributes() {
    20 
    -    // We add tor-manual-page for pages hosted at tor project. Also shared with
    21 
    -    // base-browser/mullvad-browser. See tor-browser#42583.
    22 
    -    return ["support-page", "utm-content", "tor-manual-page"];
    20 
    +    return ["support-page", "utm-content"];
    23 21 
       }
    24 22
    25 23 
       /**
    ... ... @@ -97,18 +95,18 @@ export default class MozSupportLink extends HTMLAnchorElement {
    97 95 
       }
    98 96
    99 97 
       attributeChangedCallback(attrName) {
    100 
    -    if (
    101 
    -      attrName === "support-page" ||
    102 
    -      attrName === "utm-content" ||
    103 
    -      attrName === "tor-manual-page"
    104 
    -    ) {
    98 
    +    if (attrName === "support-page" || attrName === "utm-content") {
    105 99 
           this.#setHref();
    106 100 
         }
    107 101 
       }
    108 102
    109 103 
       #setHref() {
    110 
    -    let torManualPage = this.getAttribute("tor-manual-page");
    111 
    -    if (torManualPage) {
    104 
    +    let supportPage = this.getAttribute("support-page") ?? "";
    105 
    +    // Support pages that start with "tor-manual:" are meant to point to the
    106 
    +    // Tor Project's support pages. See tor-browser#44903.
    107 
    +    const torManualPrefix = "tor-manual:";
    108 
    +    if (supportPage.startsWith(torManualPrefix)) {
    109 
    +      const torManualPage = supportPage.substring(torManualPrefix.length);
    112 110 
           const [page, anchor] = torManualPage.split("_", 2);
    113 111
    114 112 
           let locale = Services.locale.appLocaleAsBCP47;
    ... ... @@ -124,7 +122,6 @@ export default class MozSupportLink extends HTMLAnchorElement {
    124 122 
           this.href = href;
    125 123 
           return;
    126 124 
         }
    127 
    -    let supportPage = this.getAttribute("support-page") ?? "";
    128 125 
         // For base-browser we sometimes want to override firefox support links with
    129 126 
         // our own.
    130 127 
         // See tor-browser#40899.

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7d2243b5ba0c894f09fc10f8eda94a915fa2c62a...e73539d16852d2b034b61b86d2ac7f260a2479f5 at 1778079676 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx