Verified Commit 55e232ef authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in... 

fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection

Bug 42246: Migrate tor connection stuff from browser to toolkit
parent a0c928ed

browser/components/torpreferences/content/bridgeQrDialog.jsm→browser/components/torpreferences/content/bridgeQrDialog.mjs

+3 −7
Original line number Diff line number Diff line 
"use strict";

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



var EXPORTED_SYMBOLS = ["BridgeQrDialog"];

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



const { QRCode } = ChromeUtils.import("resource://gre/modules/QRCode.jsm");



const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");



class BridgeQrDialog {

export class BridgeQrDialog {

  constructor() {

    this._bridgeString = "";

  }

browser/components/torpreferences/content/builtinBridgeDialog.jsm→browser/components/torpreferences/content/builtinBridgeDialog.mjs

+11 −13
Original line number Diff line number Diff line 
"use strict";

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



var EXPORTED_SYMBOLS = ["BuiltinBridgeDialog"];

import {

  TorSettings,

  TorBridgeSource,

  TorBuiltinBridgeTypes,

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



const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

import {

  TorConnect,

  TorConnectTopics,

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



const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");



const { TorSettings, TorBridgeSource, TorBuiltinBridgeTypes } =

  ChromeUtils.importESModule("resource:///modules/TorSettings.sys.mjs");



const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule(

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

);



class BuiltinBridgeDialog {

export class BuiltinBridgeDialog {

  /**

   * Create a new instance.

   *

browser/components/torpreferences/content/connectionPane.js

+20 −20
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ const { setTimeout, clearTimeout } = ChromeUtils.import( 
);



const { TorSettings, TorSettingsTopics, TorSettingsData, TorBridgeSource } =

  ChromeUtils.importESModule("resource:///modules/TorSettings.sys.mjs");

  ChromeUtils.importESModule("resource://gre/modules/TorSettings.sys.mjs");



const { TorParsers } = ChromeUtils.importESModule(

  "resource://gre/modules/TorParsers.sys.mjs"
@@ -22,42 +22,42 @@ const { TorProviderBuilder, TorProviderTopics } = ChromeUtils.importESModule( 
);



const { TorConnect, TorConnectTopics, TorConnectState, TorCensorshipLevel } =

  ChromeUtils.importESModule("resource:///modules/TorConnect.sys.mjs");

  ChromeUtils.importESModule("resource://gre/modules/TorConnect.sys.mjs");



const { TorLogDialog } = ChromeUtils.import(

  "chrome://browser/content/torpreferences/torLogDialog.jsm"

const { TorLogDialog } = ChromeUtils.importESModule(

  "chrome://browser/content/torpreferences/torLogDialog.mjs"

);



const { ConnectionSettingsDialog } = ChromeUtils.import(

  "chrome://browser/content/torpreferences/connectionSettingsDialog.jsm"

const { ConnectionSettingsDialog } = ChromeUtils.importESModule(

  "chrome://browser/content/torpreferences/connectionSettingsDialog.mjs"

);



const { BridgeQrDialog } = ChromeUtils.import(

  "chrome://browser/content/torpreferences/bridgeQrDialog.jsm"

const { BridgeQrDialog } = ChromeUtils.importESModule(

  "chrome://browser/content/torpreferences/bridgeQrDialog.mjs"

);



const { BuiltinBridgeDialog } = ChromeUtils.import(

  "chrome://browser/content/torpreferences/builtinBridgeDialog.jsm"

const { BuiltinBridgeDialog } = ChromeUtils.importESModule(

  "chrome://browser/content/torpreferences/builtinBridgeDialog.mjs"

);



const { RequestBridgeDialog } = ChromeUtils.import(

  "chrome://browser/content/torpreferences/requestBridgeDialog.jsm"

const { RequestBridgeDialog } = ChromeUtils.importESModule(

  "chrome://browser/content/torpreferences/requestBridgeDialog.mjs"

);



const { ProvideBridgeDialog } = ChromeUtils.import(

  "chrome://browser/content/torpreferences/provideBridgeDialog.jsm"

const { ProvideBridgeDialog } = ChromeUtils.importESModule(

  "chrome://browser/content/torpreferences/provideBridgeDialog.mjs"

);



const { MoatRPC } = ChromeUtils.importESModule(

  "resource:///modules/Moat.sys.mjs"

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

);



const { QRCode } = ChromeUtils.import("resource://gre/modules/QRCode.jsm");

const { QRCode } = ChromeUtils.importESModule(

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

);



ChromeUtils.defineModuleGetter(

  this,

  "TorStrings",

  "resource:///modules/TorStrings.jsm"

const { TorStrings } = ChromeUtils.importESModule(

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

);



const InternetStatus = Object.freeze({

browser/components/torpreferences/content/connectionSettingsDialog.jsm→browser/components/torpreferences/content/connectionSettingsDialog.mjs

+6 −9
Original line number Diff line number Diff line 
"use strict";

import {

  TorSettings,

  TorProxyType,

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



var EXPORTED_SYMBOLS = ["ConnectionSettingsDialog"];

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



const { TorSettings, TorProxyType } = ChromeUtils.importESModule(

  "resource:///modules/TorSettings.sys.mjs"

);



const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");



class ConnectionSettingsDialog {

export class ConnectionSettingsDialog {

  constructor() {

    this._dialog = null;

    this._useProxyCheckbox = null;

browser/components/torpreferences/content/provideBridgeDialog.jsm→browser/components/torpreferences/content/provideBridgeDialog.mjs

+10 −14
Original line number Diff line number Diff line 
"use strict";

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



var EXPORTED_SYMBOLS = ["ProvideBridgeDialog"];

import {

  TorSettings,

  TorBridgeSource,

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



const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

import {

  TorConnect,

  TorConnectTopics,

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



const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");



const { TorSettings, TorBridgeSource } = ChromeUtils.importESModule(

  "resource:///modules/TorSettings.sys.mjs"

);



const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule(

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

);



class ProvideBridgeDialog {

export class ProvideBridgeDialog {

  constructor(onSubmit) {

    this.onSubmit = onSubmit;

    this._dialog = null;