morgan pushed to branch tor-browser-128.8.0esr-14.5-1 at The Tor Project / Applications / Tor Browser

Commits: b0a250cd by Henry Wilkes at 2025-03-19T11:15:37+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser

TB 42656: Drop maybeUpdateOpenLocationForTorConnect.

- - - - -

1 changed file:

- browser/components/urlbar/UrlbarInput.sys.mjs

Changes:

===================================== browser/components/urlbar/UrlbarInput.sys.mjs ===================================== @@ -20,7 +20,6 @@ ChromeUtils.defineESModuleGetters(lazy, { ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs", SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs", SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs", - TorConnect: "resource://gre/modules/TorConnect.sys.mjs", UrlbarController: "resource:///modules/UrlbarController.sys.mjs", UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.sys.mjs", UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs", @@ -276,36 +275,6 @@ export class UrlbarInput { ); }

- // in certain scenarios we want user input uris to open in a new tab if they do so from the - // about:torconnect tab - #maybeUpdateOpenLocationForTorConnect( - openUILinkWhere, - currentURI, - destinationURI - ) { - try { - // only open in new tab if: - if ( - // user is navigating away from about:torconnect - currentURI === "about:torconnect" && - // we are trying to open in same tab - openUILinkWhere === "current" && - // only if user still has not bootstrapped - lazy.TorConnect.shouldShowTorConnect && - // and user is not just navigating to about:torconnect - destinationURI !== "about:torconnect" - ) { - return "tab"; - } - } catch (e) { - // swallow exception and fall through returning original so we don't accidentally break - // anything if an exception is thrown - this.logger.error(e?.message ? e.message : e); - } - - return openUILinkWhere; - } - /** * Applies styling to the text in the urlbar input, depending on the text. */ @@ -3017,11 +2986,6 @@ export class UrlbarInput { this.inputField.setSelectionRange(0, 0); }

- openUILinkWhere = this.#maybeUpdateOpenLocationForTorConnect( - openUILinkWhere, - this.window.gBrowser.currentURI.asciiSpec, - url - ); if (openUILinkWhere != "current") { this.handleRevert(); }

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b0a250cd...