Verified Commit f124595b authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in... 

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Update Manual URLs
parent c2c361fb

browser/components/torpreferences/content/builtinBridgeDialog.jsm

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ class BuiltinBridgeDialog { 
    });

    this._dialog.addEventListener("dialoghelp", e => {

      window.top.openTrustedLinkIn(

        "https://tb-manual.torproject.org/circumvention/",

        TorStrings.settings.learnMoreCircumventionURL,

        "tab"

      );

    });

browser/components/torpreferences/content/connectionPane.js

+13 −1
Original line number Diff line number Diff line
@@ -242,6 +242,9 @@ const gConnectionPane = (function() { 
          "href",

          TorStrings.settings.learnMoreTorBrowserURL

        );

        if (TorStrings.settings.learnMoreTorBrowserURL.startsWith("about:")) {

          learnMore.setAttribute("useoriginprincipal", "true");

        }

      }



      // Internet and Tor status
@@ -328,6 +331,9 @@ const gConnectionPane = (function() { 
        let learnMore = prefpane.querySelector(selectors.bridges.learnMore);

        learnMore.setAttribute("value", TorStrings.settings.learnMore);

        learnMore.setAttribute("href", TorStrings.settings.learnMoreBridgesURL);

        if (TorStrings.settings.learnMoreBridgesURL.startsWith("about:")) {

          learnMore.setAttribute("useoriginprincipal", "true");

        }

      }



      // Location
@@ -440,7 +446,13 @@ const gConnectionPane = (function() { 
          selectors.bridges.cardLearnMore

        );

        learnMore.setAttribute("value", TorStrings.settings.learnMore);

        learnMore.setAttribute("href", "about:blank");

        learnMore.setAttribute(

          "href",

          TorStrings.settings.learnMoreBridgesCardURL

        );

        if (TorStrings.settings.learnMoreBridgesCardURL.startsWith("about:")) {

          learnMore.setAttribute("useoriginprincipal", "true");

        }

      }

      bridgeTemplate.querySelector(

        selectors.bridges.cardConnectedLabel

browser/components/torpreferences/content/provideBridgeDialog.jsm

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class ProvideBridgeDialog { 
    });

    this._dialog.addEventListener("dialoghelp", e => {

      window.top.openTrustedLinkIn(

        "https://tb-manual.torproject.org/bridges/",

        TorStrings.settings.learnMoreBridgesURL,

        "tab"

      );

    });

browser/components/torpreferences/content/requestBridgeDialog.jsm

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ class RequestBridgeDialog { 
    });

    this._dialog.addEventListener("dialoghelp", e => {

      window.top.openTrustedLinkIn(

        "https://tb-manual.torproject.org/bridges/",

        TorStrings.settings.learnMoreBridgesURL,

        "tab"

      );

    });