Commit d51cd656 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser 

BB 43824: Move from resources:// to moz-src:///.
parent 639b178c

browser/base/content/browser.js

+5 −4
Original line number Diff line number Diff line
@@ -107,10 +107,11 @@ ChromeUtils.defineESModuleGetters(this, { 
  ToolbarDropHandler:

    "moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs",

  ToolbarIconColor: "moz-src:///browser/themes/ToolbarIconColor.sys.mjs",

  TorConnect: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectStage: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectTopics: "resource://gre/modules/TorConnect.sys.mjs",

  TorConnectParent: "resource:///actors/TorConnectParent.sys.mjs",

  TorConnect: "moz-src:///toolkit/modules/TorConnect.sys.mjs",

  TorConnectStage: "moz-src:///toolkit/modules/TorConnect.sys.mjs",

  TorConnectTopics: "moz-src:///toolkit/modules/TorConnect.sys.mjs",

  TorConnectParent:

    "moz-src:///browser/components/torconnect/TorConnectParent.sys.mjs",

  TorDomainIsolator:

    "moz-src:///toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs",

  TorUIUtils: "moz-src:///browser/modules/TorUIUtils.sys.mjs",

browser/components/DesktopActorRegistry.sys.mjs

+4 −2
Original line number Diff line number Diff line
@@ -838,10 +838,12 @@ let JSWINDOWACTORS = { 


  TorConnect: {

    parent: {

      esModuleURI: "resource:///actors/TorConnectParent.sys.mjs",

      esModuleURI:

        "moz-src:///browser/components/torconnect/TorConnectParent.sys.mjs",

    },

    child: {

      esModuleURI: "resource:///actors/TorConnectChild.sys.mjs",

      esModuleURI:

        "moz-src:///browser/components/torconnect/TorConnectChild.sys.mjs",

      events: {

        DOMWindowCreated: {},

      },

browser/components/torconnect/TorConnectParent.sys.mjs

+2 −2
Original line number Diff line number Diff line 
// Copyright (c) 2021, The Tor Project, Inc.



import { TorStrings } from "resource://gre/modules/TorStrings.sys.mjs";

import { TorStrings } from "moz-src:///toolkit/modules/TorStrings.sys.mjs";

import {

  TorConnect,

  TorConnectTopics,

} from "resource://gre/modules/TorConnect.sys.mjs";

} from "moz-src:///toolkit/modules/TorConnect.sys.mjs";



const lazy = {};

browser/components/torconnect/content/torConnectTitlebarStatus.js

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ var gTorConnectTitlebarStatus = { 
   */

  init() {

    const { TorStrings } = ChromeUtils.importESModule(

      "resource://gre/modules/TorStrings.sys.mjs"

      "moz-src:///toolkit/modules/TorStrings.sys.mjs"

    );



    this._strings = TorStrings.torConnect;

browser/components/torconnect/content/torConnectUrlbarButton.js

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ var gTorConnectUrlbarButton = { 
    this._isActive = true;



    const { TorStrings } = ChromeUtils.importESModule(

      "resource://gre/modules/TorStrings.sys.mjs"

      "moz-src:///toolkit/modules/TorStrings.sys.mjs"

    );



    document.getElementById("tor-connect-urlbar-button-label").value =