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 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.
- - - - -
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:
===================================== browser/components/torpreferences/content/builtinBridgeDialog.mjs ===================================== @@ -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 ===================================== @@ -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 ===================================== @@ -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 ===================================== @@ -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" >​<br />​</html:div
===================================== browser/components/torpreferences/content/requestBridgeDialog.mjs ===================================== @@ -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;
===================================== browser/components/torpreferences/content/requestBridgeDialog.xhtml ===================================== @@ -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-requestBridge-dialog" buttons="help,accept,cancel"> + <dialog id="torPreferences-requestBridge-dialog" buttons="accept,cancel"> <!-- ok, so ​ is a zero-width space. We need to have *something* in the innerText so that XUL knows how tall the title node is so that it can determine how large to make the dialog element's inner draw area. If we have nothing in the innerText, then it collapse to 0 height, and the contents of the dialog ends up partially hidden >:( -->
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3db7a880...
tor-commits@lists.torproject.org