| ... |
... |
@@ -20,7 +20,6 @@ ChromeUtils.defineESModuleGetters(lazy, { |
|
20
|
20
|
ReaderMode: "resource://gre/modules/ReaderMode.sys.mjs",
|
|
21
|
21
|
SearchUIUtils: "resource:///modules/SearchUIUtils.sys.mjs",
|
|
22
|
22
|
SearchUtils: "resource://gre/modules/SearchUtils.sys.mjs",
|
|
23
|
|
- TorConnect: "resource://gre/modules/TorConnect.sys.mjs",
|
|
24
|
23
|
UrlbarController: "resource:///modules/UrlbarController.sys.mjs",
|
|
25
|
24
|
UrlbarEventBufferer: "resource:///modules/UrlbarEventBufferer.sys.mjs",
|
|
26
|
25
|
UrlbarPrefs: "resource:///modules/UrlbarPrefs.sys.mjs",
|
| ... |
... |
@@ -276,36 +275,6 @@ export class UrlbarInput { |
|
276
|
275
|
);
|
|
277
|
276
|
}
|
|
278
|
277
|
|
|
279
|
|
- // in certain scenarios we want user input uris to open in a new tab if they do so from the
|
|
280
|
|
- // about:torconnect tab
|
|
281
|
|
- #maybeUpdateOpenLocationForTorConnect(
|
|
282
|
|
- openUILinkWhere,
|
|
283
|
|
- currentURI,
|
|
284
|
|
- destinationURI
|
|
285
|
|
- ) {
|
|
286
|
|
- try {
|
|
287
|
|
- // only open in new tab if:
|
|
288
|
|
- if (
|
|
289
|
|
- // user is navigating away from about:torconnect
|
|
290
|
|
- currentURI === "about:torconnect" &&
|
|
291
|
|
- // we are trying to open in same tab
|
|
292
|
|
- openUILinkWhere === "current" &&
|
|
293
|
|
- // only if user still has not bootstrapped
|
|
294
|
|
- lazy.TorConnect.shouldShowTorConnect &&
|
|
295
|
|
- // and user is not just navigating to about:torconnect
|
|
296
|
|
- destinationURI !== "about:torconnect"
|
|
297
|
|
- ) {
|
|
298
|
|
- return "tab";
|
|
299
|
|
- }
|
|
300
|
|
- } catch (e) {
|
|
301
|
|
- // swallow exception and fall through returning original so we don't accidentally break
|
|
302
|
|
- // anything if an exception is thrown
|
|
303
|
|
- this.logger.error(e?.message ? e.message : e);
|
|
304
|
|
- }
|
|
305
|
|
-
|
|
306
|
|
- return openUILinkWhere;
|
|
307
|
|
- }
|
|
308
|
|
-
|
|
309
|
278
|
/**
|
|
310
|
279
|
* Applies styling to the text in the urlbar input, depending on the text.
|
|
311
|
280
|
*/
|
| ... |
... |
@@ -3017,11 +2986,6 @@ export class UrlbarInput { |
|
3017
|
2986
|
this.inputField.setSelectionRange(0, 0);
|
|
3018
|
2987
|
}
|
|
3019
|
2988
|
|
|
3020
|
|
- openUILinkWhere = this.#maybeUpdateOpenLocationForTorConnect(
|
|
3021
|
|
- openUILinkWhere,
|
|
3022
|
|
- this.window.gBrowser.currentURI.asciiSpec,
|
|
3023
|
|
- url
|
|
3024
|
|
- );
|
|
3025
|
2989
|
if (openUILinkWhere != "current") {
|
|
3026
|
2990
|
this.handleRevert();
|
|
3027
|
2991
|
}
|