Commit 3db7a880 authored by henry's avatar henry Committed by richard
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 42303: Remove unused "help" button logic from bridge dialogs. Follows
bugzilla bug 1784882.
parent 27e45bc9

browser/components/torpreferences/content/builtinBridgeDialog.mjs

+0 −6
Original line number Diff line number Diff line
@@ -86,12 +86,6 @@ export class BuiltinBridgeDialog { 
    dialog.addEventListener("dialogaccept", () => {

      this.onSubmit(this._radioGroup.value, TorConnect.canBeginBootstrap);

    });

    dialog.addEventListener("dialoghelp", e => {

      window.top.openTrustedLinkIn(

        TorStrings.settings.learnMoreCircumventionURL,

        "tab"

      );

    });



    this._acceptButton = dialog.getButton("accept");

browser/components/torpreferences/content/builtinBridgeDialog.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

  xmlns:html="http://www.w3.org/1999/xhtml"

>

  <dialog id="torPreferences-builtinBridge-dialog" buttons="help,accept,cancel">

  <dialog id="torPreferences-builtinBridge-dialog" buttons="accept,cancel">

    <description id="torPreferences-builtinBridge-description"> </description>

    <radiogroup id="torPreferences-builtinBridge-typeSelection">

      <vbox class="builtin-bridges-option">

browser/components/torpreferences/content/provideBridgeDialog.mjs

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ export class ProvideBridgeDialog { 
    this._dialog.addEventListener("dialogaccept", e => {

      this.onSubmit(this._textarea.value, TorConnect.canBeginBootstrap);

    });

    this._dialog.addEventListener("dialoghelp", openHelp);



    this._acceptButton = this._dialog.getButton("accept");

browser/components/torpreferences/content/provideBridgeDialog.xhtml

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

  xmlns:html="http://www.w3.org/1999/xhtml"

>

  <dialog id="torPreferences-provideBridge-dialog" buttons="help,accept,cancel">

  <dialog id="torPreferences-provideBridge-dialog" buttons="accept,cancel">

    <description>

      <html:div id="torPreferences-provideBridge-description"

        >&#8203;<br />&#8203;</html:div

browser/components/torpreferences/content/requestBridgeDialog.mjs

+0 −6
Original line number Diff line number Diff line
@@ -62,12 +62,6 @@ export class RequestBridgeDialog { 
      e.preventDefault();

      this.onSubmitCaptcha();

    });

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

      window.top.openTrustedLinkIn(

        TorStrings.settings.learnMoreBridgesURL,

        "tab"

      );

    });



    this._dialogHeader = this._dialog.querySelector(selectors.dialogHeader);

    this._dialogHeader.textContent = TorStrings.settings.contactingBridgeDB;