richard pushed to branch tor-browser-115.5.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
- 
3db7a880
by Henry Wilkes at 2023-11-30T12:15:07+00:00
6 changed files:
- browser/components/torpreferences/content/builtinBridgeDialog.mjs
- browser/components/torpreferences/content/builtinBridgeDialog.xhtml
- browser/components/torpreferences/content/provideBridgeDialog.mjs
- browser/components/torpreferences/content/provideBridgeDialog.xhtml
- browser/components/torpreferences/content/requestBridgeDialog.mjs
- browser/components/torpreferences/content/requestBridgeDialog.xhtml
Changes:
| ... | ... | @@ -86,12 +86,6 @@ export class BuiltinBridgeDialog { | 
| 86 | 86 |      dialog.addEventListener("dialogaccept", () => {
 | 
| 87 | 87 |        this.onSubmit(this._radioGroup.value, TorConnect.canBeginBootstrap);
 | 
| 88 | 88 |      });
 | 
| 89 | -    dialog.addEventListener("dialoghelp", e => {
 | |
| 90 | -      window.top.openTrustedLinkIn(
 | |
| 91 | -        TorStrings.settings.learnMoreCircumventionURL,
 | |
| 92 | -        "tab"
 | |
| 93 | -      );
 | |
| 94 | -    });
 | |
| 95 | 89 | |
| 96 | 90 |      this._acceptButton = dialog.getButton("accept");
 | 
| 97 | 91 | 
| ... | ... | @@ -8,7 +8,7 @@ | 
| 8 | 8 |    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 | 
| 9 | 9 |    xmlns:html="http://www.w3.org/1999/xhtml"
 | 
| 10 | 10 |  >
 | 
| 11 | -  <dialog id="torPreferences-builtinBridge-dialog" buttons="help,accept,cancel">
 | |
| 11 | +  <dialog id="torPreferences-builtinBridge-dialog" buttons="accept,cancel">
 | |
| 12 | 12 |      <description id="torPreferences-builtinBridge-description"> </description>
 | 
| 13 | 13 |      <radiogroup id="torPreferences-builtinBridge-typeSelection">
 | 
| 14 | 14 |        <vbox class="builtin-bridges-option">
 | 
| ... | ... | @@ -61,7 +61,6 @@ export class ProvideBridgeDialog { | 
| 61 | 61 |      this._dialog.addEventListener("dialogaccept", e => {
 | 
| 62 | 62 |        this.onSubmit(this._textarea.value, TorConnect.canBeginBootstrap);
 | 
| 63 | 63 |      });
 | 
| 64 | -    this._dialog.addEventListener("dialoghelp", openHelp);
 | |
| 65 | 64 | |
| 66 | 65 |      this._acceptButton = this._dialog.getButton("accept");
 | 
| 67 | 66 | 
| ... | ... | @@ -8,7 +8,7 @@ | 
| 8 | 8 |    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 | 
| 9 | 9 |    xmlns:html="http://www.w3.org/1999/xhtml"
 | 
| 10 | 10 |  >
 | 
| 11 | -  <dialog id="torPreferences-provideBridge-dialog" buttons="help,accept,cancel">
 | |
| 11 | +  <dialog id="torPreferences-provideBridge-dialog" buttons="accept,cancel">
 | |
| 12 | 12 |      <description>
 | 
| 13 | 13 |        <html:div id="torPreferences-provideBridge-description"
 | 
| 14 | 14 |          >​<br />​</html:div
 | 
| ... | ... | @@ -62,12 +62,6 @@ export class RequestBridgeDialog { | 
| 62 | 62 |        e.preventDefault();
 | 
| 63 | 63 |        this.onSubmitCaptcha();
 | 
| 64 | 64 |      });
 | 
| 65 | -    this._dialog.addEventListener("dialoghelp", e => {
 | |
| 66 | -      window.top.openTrustedLinkIn(
 | |
| 67 | -        TorStrings.settings.learnMoreBridgesURL,
 | |
| 68 | -        "tab"
 | |
| 69 | -      );
 | |
| 70 | -    });
 | |
| 71 | 65 | |
| 72 | 66 |      this._dialogHeader = this._dialog.querySelector(selectors.dialogHeader);
 | 
| 73 | 67 |      this._dialogHeader.textContent = TorStrings.settings.contactingBridgeDB;
 | 
| ... | ... | @@ -8,7 +8,7 @@ | 
| 8 | 8 |    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 | 
| 9 | 9 |    xmlns:html="http://www.w3.org/1999/xhtml"
 | 
| 10 | 10 |  >
 | 
| 11 | -  <dialog id="torPreferences-requestBridge-dialog" buttons="help,accept,cancel">
 | |
| 11 | +  <dialog id="torPreferences-requestBridge-dialog" buttons="accept,cancel">
 | |
| 12 | 12 |      <!-- ok, so ​ is a zero-width space. We need to have *something* in the innerText so that XUL knows how tall the
 | 
| 13 | 13 |         title node is so that it can determine how large to make the dialog element's inner draw area. If we have nothing
 | 
| 14 | 14 |         in the innerText, then it collapse to 0 height, and the contents of the dialog ends up partially hidden >:( -->
 |