Skip to content
Snippets Groups Projects
Commit 46ba3a3d authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame :jack_o_lantern: Committed by richard
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 8fadf4d1
Branches
No related tags found
1 merge request!842Bug 42246: Migrate tor connection stuff from browser to toolkit
"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 = "";
}
......
"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.
*
......
......@@ -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({
......
"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;
......
"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;
......
"use strict";
import { BridgeDB } from "resource://gre/modules/BridgeDB.sys.mjs";
import { TorStrings } from "resource://gre/modules/TorStrings.sys.mjs";
var EXPORTED_SYMBOLS = ["RequestBridgeDialog"];
import {
TorConnect,
TorConnectTopics,
} from "resource://gre/modules/TorConnect.sys.mjs";
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { BridgeDB } = ChromeUtils.importESModule(
"resource:///modules/BridgeDB.sys.mjs"
);
const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
const { TorConnect, TorConnectTopics } = ChromeUtils.importESModule(
"resource:///modules/TorConnect.sys.mjs"
);
class RequestBridgeDialog {
export class RequestBridgeDialog {
constructor(onSubmit) {
this.onSubmit = onSubmit;
this._dialog = null;
......
"use strict";
import { setTimeout, clearTimeout } from "resource://gre/modules/Timer.sys.mjs";
var EXPORTED_SYMBOLS = ["TorLogDialog"];
import { TorProviderBuilder } from "resource://gre/modules/TorProviderBuilder.sys.mjs";
import { TorStrings } from "resource://gre/modules/TorStrings.sys.mjs";
const { setTimeout, clearTimeout } = ChromeUtils.importESModule(
"resource://gre/modules/Timer.sys.mjs"
);
const { TorProviderBuilder } = ChromeUtils.importESModule(
"resource://gre/modules/TorProviderBuilder.sys.mjs"
);
const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
class TorLogDialog {
export class TorLogDialog {
constructor() {
this._dialog = null;
this._logTextarea = null;
......
@import url("chrome://browser/skin/browser-colors.css");
@import url("chrome://global/skin/browser-colors.css");
#category-connection > .category-icon {
list-style-image: url("chrome://browser/content/torconnect/tor-connect.svg");
list-style-image: url("chrome://global/content/torconnect/tor-connect.svg");
}
/* Status */
......@@ -37,7 +37,7 @@
}
#torPreferences-status-tor-connect .torPreferences-status-icon {
list-style-image: url("chrome://browser/content/torconnect/tor-connect-broken.svg");
list-style-image: url("chrome://global/content/torconnect/tor-connect-broken.svg");
}
.torPreferences-status-name {
......@@ -54,7 +54,7 @@
}
#torPreferences-status-tor-connect.connected .torPreferences-status-icon {
list-style-image: url("chrome://browser/content/torconnect/tor-connect.svg");
list-style-image: url("chrome://global/content/torconnect/tor-connect.svg");
}
#torPreferences-status-tor-connect.blocked .torPreferences-status-icon {
......
browser.jar:
content/browser/torpreferences/bridgeQrDialog.xhtml (content/bridgeQrDialog.xhtml)
content/browser/torpreferences/bridgeQrDialog.jsm (content/bridgeQrDialog.jsm)
content/browser/torpreferences/bridgeQrDialog.mjs (content/bridgeQrDialog.mjs)
content/browser/torpreferences/builtinBridgeDialog.xhtml (content/builtinBridgeDialog.xhtml)
content/browser/torpreferences/builtinBridgeDialog.jsm (content/builtinBridgeDialog.jsm)
content/browser/torpreferences/builtinBridgeDialog.mjs (content/builtinBridgeDialog.mjs)
content/browser/torpreferences/connectionSettingsDialog.xhtml (content/connectionSettingsDialog.xhtml)
content/browser/torpreferences/connectionSettingsDialog.jsm (content/connectionSettingsDialog.jsm)
content/browser/torpreferences/connectionSettingsDialog.mjs (content/connectionSettingsDialog.mjs)
content/browser/torpreferences/network.svg (content/network.svg)
content/browser/torpreferences/network-broken.svg (content/network-broken.svg)
content/browser/torpreferences/provideBridgeDialog.xhtml (content/provideBridgeDialog.xhtml)
content/browser/torpreferences/provideBridgeDialog.jsm (content/provideBridgeDialog.jsm)
content/browser/torpreferences/provideBridgeDialog.mjs (content/provideBridgeDialog.mjs)
content/browser/torpreferences/requestBridgeDialog.xhtml (content/requestBridgeDialog.xhtml)
content/browser/torpreferences/requestBridgeDialog.jsm (content/requestBridgeDialog.jsm)
content/browser/torpreferences/requestBridgeDialog.mjs (content/requestBridgeDialog.mjs)
content/browser/torpreferences/connectionCategory.inc.xhtml (content/connectionCategory.inc.xhtml)
content/browser/torpreferences/torLogDialog.jsm (content/torLogDialog.jsm)
content/browser/torpreferences/torLogDialog.mjs (content/torLogDialog.mjs)
content/browser/torpreferences/torLogDialog.xhtml (content/torLogDialog.xhtml)
content/browser/torpreferences/connectionPane.js (content/connectionPane.js)
content/browser/torpreferences/connectionPane.xhtml (content/connectionPane.xhtml)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment