Commit f14c6b11 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

Bug 41912: Hide "Use Current Bridges" when we do not have any bridge
strings.
parent 10f40c2f

browser/components/torpreferences/content/connectionPane.js

+9 −8
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ const gConnectionPane = (function () { 
      currentHeader: "#torPreferences-currentBridges-header",

      currentDescription: "#torPreferences-currentBridges-description",

      currentDescriptionText: "#torPreferences-currentBridges-descriptionText",

      controls: "#torPreferences-currentBridges-controls",

      switch: "#torPreferences-currentBridges-switch",

      cards: "#torPreferences-currentBridges-cards",

      cardTemplate: "#torPreferences-bridgeCard-template",
@@ -391,6 +392,7 @@ const gConnectionPane = (function () { 
        selectors.bridges.currentHeader

      );

      bridgeHeader.textContent = TorStrings.settings.bridgeCurrent;

      const bridgeControls = prefpane.querySelector(selectors.bridges.controls);

      const bridgeSwitch = prefpane.querySelector(selectors.bridges.switch);

      bridgeSwitch.setAttribute("label", TorStrings.settings.allBridgesEnabled);

      bridgeSwitch.addEventListener("toggle", () => {
@@ -629,18 +631,17 @@ const gConnectionPane = (function () { 


        const newStrings = new Set(TorSettings.bridges.bridge_strings);

        const numBridges = newStrings.size;

        if (!newStrings.size) {

          bridgeHeader.hidden = true;

          bridgeDescription.hidden = true;

          bridgeCards.hidden = true;

        const noBridges = !numBridges;

        bridgeHeader.hidden = noBridges;

        bridgeDescription.hidden = noBridges;

        bridgeControls.hidden = noBridges;

        bridgeCards.hidden = noBridges;

        if (noBridges) {

          showAll.hidden = true;

          removeAll.hidden = true;

          bridgeCards.textContent = "";

          return;

        }

        bridgeHeader.hidden = false;

        bridgeDescription.hidden = false;

        bridgeCards.hidden = false;

        // Changing the pressed property on moz-toggle should not trigger its

        // "toggle" event.

        bridgeSwitch.pressed = TorSettings.bridges.enabled;

browser/components/torpreferences/content/connectionPane.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
    <description flex="1" id="torPreferences-currentBridges-description">

      <html:span id="torPreferences-currentBridges-descriptionText" />

    </description>

    <hbox align="center">

    <hbox align="center" id="torPreferences-currentBridges-controls">

      <html:moz-toggle

        id="torPreferences-currentBridges-switch"

        label-align-after=""