mirror of
https://forge.fsky.io/oneflux/omegafox.git
synced 2026-02-10 05:02:04 -08:00
Merge branch 'main' of https://github.com/daijro/camoufox
This commit is contained in:
commit
15d26c35d5
2 changed files with 11 additions and 6 deletions
|
|
@ -1,24 +1,28 @@
|
||||||
diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
|
diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
|
||||||
index e7a516dcd3..afb84679db 100644
|
index 179816fa96..c7de1c2278 100644
|
||||||
--- a/browser/components/extensions/parent/ext-browser.js
|
--- a/browser/components/extensions/parent/ext-browser.js
|
||||||
+++ b/browser/components/extensions/parent/ext-browser.js
|
+++ b/browser/components/extensions/parent/ext-browser.js
|
||||||
@@ -62,6 +62,7 @@ extensions.on("page-shutdown", (type, context) => {
|
@@ -62,6 +62,9 @@ extensions.on("page-shutdown", (type, context) => {
|
||||||
/* eslint-enable mozilla/balanced-listeners */
|
/* eslint-enable mozilla/balanced-listeners */
|
||||||
|
|
||||||
global.openOptionsPage = extension => {
|
global.openOptionsPage = extension => {
|
||||||
+ if (true) {return Promise.reject({ message: "Rejected by Camoufox." })};
|
+ if (!ChromeUtils.camouGetBool('allowAddonNewtab', false)) {
|
||||||
|
+ return Promise.reject({ message: "Rejected by Camoufox." });
|
||||||
|
+ }
|
||||||
let window = windowTracker.topWindow;
|
let window = windowTracker.topWindow;
|
||||||
if (!window) {
|
if (!window) {
|
||||||
return Promise.reject({ message: "No browser window available" });
|
return Promise.reject({ message: "No browser window available" });
|
||||||
diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
|
diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
|
||||||
index 4b8d296d67..09342331e2 100644
|
index b47f0510e3..649caccc60 100644
|
||||||
--- a/browser/components/extensions/parent/ext-tabs.js
|
--- a/browser/components/extensions/parent/ext-tabs.js
|
||||||
+++ b/browser/components/extensions/parent/ext-tabs.js
|
+++ b/browser/components/extensions/parent/ext-tabs.js
|
||||||
@@ -683,6 +683,7 @@ this.tabs = class extends ExtensionAPIPersistent {
|
@@ -700,6 +700,9 @@ this.tabs = class extends ExtensionAPIPersistent {
|
||||||
}).api(),
|
}).api(),
|
||||||
|
|
||||||
create(createProperties) {
|
create(createProperties) {
|
||||||
+ if (true) {return Promise.reject({ message: "Rejected by Camoufox." })};
|
+ if (!ChromeUtils.camouGetBool('allowAddonNewtab', false)) {
|
||||||
|
+ return Promise.reject({ message: "Rejected by Camoufox." });
|
||||||
|
+ }
|
||||||
return new Promise(resolve => {
|
return new Promise(resolve => {
|
||||||
let window =
|
let window =
|
||||||
createProperties.windowId !== null
|
createProperties.windowId !== null
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ class Proxy:
|
||||||
server: str
|
server: str
|
||||||
username: Optional[str] = None
|
username: Optional[str] = None
|
||||||
password: Optional[str] = None
|
password: Optional[str] = None
|
||||||
|
bypass: Optional[str] = None
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse_server(server: str) -> Tuple[str, str, Optional[str]]:
|
def parse_server(server: str) -> Tuple[str, str, Optional[str]]:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue