From 18d0b43e67abf5911e5ec73ee5d3fdc65561b3d1 Mon Sep 17 00:00:00 2001
From: didierfred <didierfred@gmail.com>
Date: Mon, 19 Nov 2018 10:13:57 +0100
Subject: [PATCH] use only chrome javascript domain name instead of browser
---
background.js | 25 ++++++++-----------------
popup/config.js | 19 +++++--------------
popup/menu.js | 47 +++++++++++------------------------------------
3 files changed, 24 insertions(+), 67 deletions(-)
diff --git a/background.js b/background.js
index 045367a..4632e84 100644
--- a/background.js
+++ b/background.js
@@ -14,16 +14,7 @@ let config ;
let started = "off";
let debug_mode = false;
-let generic_browser ;
-let is_chrome = false;
-// check if chrome
-if (chrome===undefined) generic_browser=browser;
-else {
- generic_browser= chrome;
- is_chrome=true;
-}
-console.log("is_chrome set to " + is_chrome);
// if configuration exist
if (localStorage.getItem('config')) {
@@ -80,11 +71,11 @@ else started = localStorage.getItem('started');
if (started==="on") {
addListener();
- generic_browser.browserAction.setIcon({ path: "icons/modify-green-32.png"});
+ chrome.browserAction.setIcon({ path: "icons/modify-green-32.png"});
}
// listen for change in configuration or start/stop
-generic_browser.runtime.onMessage.addListener(notify);
+chrome.runtime.onMessage.addListener(notify);
/*
@@ -190,13 +181,13 @@ function notify(message) {
}
else if (message==="off") {
removeListener();
- generic_browser.browserAction.setIcon({ path: "icons/modify-32.png"});
+ chrome.browserAction.setIcon({ path: "icons/modify-32.png"});
started="off";
if (config.debug_mode) log("Stop modifying headers");
}
else if (message==="on") {
addListener();
- generic_browser.browserAction.setIcon({ path: "icons/modify-green-32.png"});
+ chrome.browserAction.setIcon({ path: "icons/modify-green-32.png"});
started="on";
if (config.debug_mode) log("Start modifying headers");
}
@@ -210,11 +201,11 @@ function notify(message) {
function addListener() {
let target = config.target_page;
if ((target==="*")||(target==="")||(target===" ")) target="<all_urls>";
- generic_browser.webRequest.onBeforeSendHeaders.addListener(rewriteRequestHeader,
+ chrome.webRequest.onBeforeSendHeaders.addListener(rewriteRequestHeader,
{urls: target.split(";")},
["blocking", "requestHeaders"]);
- generic_browser.webRequest.onHeadersReceived.addListener(rewriteResponseHeader,
+ chrome.webRequest.onHeadersReceived.addListener(rewriteResponseHeader,
{urls: target.split(";")},
["blocking", "responseHeaders"]);
}
@@ -225,8 +216,8 @@ function addListener() {
*
*/
function removeListener() {
- generic_browser.webRequest.onBeforeSendHeaders.removeListener(rewriteRequestHeader);
- generic_browser.webRequest.onHeadersReceived.removeListener(rewriteResponseHeader);
+ chrome.webRequest.onBeforeSendHeaders.removeListener(rewriteRequestHeader);
+ chrome.webRequest.onHeadersReceived.removeListener(rewriteResponseHeader);
}
diff --git a/popup/config.js b/popup/config.js
index 4a9071a..c388a67 100644
--- a/popup/config.js
+++ b/popup/config.js
@@ -20,19 +20,10 @@ let comments_field_size= 28;
let input_field_style="form_control input_field_small";
-let generic_browser ;
-let is_chrome = false;
-
window.onload = function() {
- // check if chrome
- if (chrome===undefined) generic_browser=browser;
- else {
- generic_browser= chrome;
- is_chrome=true;
- }
// load configuration from local storage
let config = JSON.parse(localStorage.getItem("config"));
if (config.debug_mode) document.getElementById("debug_mode").checked = true;
@@ -252,7 +243,7 @@ function isTargetValid(target) {
function saveData() {
if (!isTargetValid(document.getElementById('targetPage').value)) alert("Warning: Url patterns are invalid");
localStorage.setItem("config",create_configuration_data());
- generic_browser.runtime.sendMessage("reload");
+ chrome.runtime.sendMessage("reload");
return true;
}
@@ -338,7 +329,7 @@ function readSingleFile(e) {
// store the conf in the local storage
localStorage.setItem("config",JSON.stringify(config));
// load the new conf
- generic_browser.runtime.sendMessage("reload");
+ chrome.runtime.sendMessage("reload");
// reload the configuration page with the new conf
document.location.href="config.html";
}
@@ -355,7 +346,7 @@ function readSingleFile(e) {
// store the conf in the local storage
localStorage.setItem("config",JSON.stringify(to_load));
// load the new conf
- generic_browser.runtime.sendMessage("reload");
+ chrome.runtime.sendMessage("reload");
// reload the configuration page with the new conf
document.location.href="config.html";
}
@@ -438,13 +429,13 @@ function startModify() {
if (started==="off") {
saveData();
localStorage.setItem("started","on");
- generic_browser.runtime.sendMessage("on");
+ chrome.runtime.sendMessage("on");
started = "on";
document.getElementById("start_img").src = "img/stop.png";
}
else {
localStorage.setItem("started","off");
- generic_browser.runtime.sendMessage("off");
+ chrome.runtime.sendMessage("off");
started = "off";
document.getElementById("start_img").src = "img/start.png";
}
diff --git a/popup/menu.js b/popup/menu.js
index 22d7374..f7ab89d 100644
--- a/popup/menu.js
+++ b/popup/menu.js
@@ -11,21 +11,8 @@
var started = "off";
-let generic_browser ;
-let is_chrome = false;
window.onload = function() {
-
-
-
- // check if chrome
- if (browser!=undefined) generic_browser=browser;
- else {
- generic_browser= chrome;
- is_chrome=true;
- }
-console.log("is_chrome set to" + is_chrome);
-
document.getElementById('config').addEventListener('click',function (e) {start_config();});
document.getElementById('start_stop').addEventListener('click',function (e) {start_modify();});
started = localStorage.getItem("started");
@@ -39,25 +26,21 @@ function start_modify()
if (started=="off")
{
localStorage.setItem("started","on");
- generic_browser.runtime.sendMessage("on");
+ chrome.runtime.sendMessage("on");
started = "on";
document.getElementById("start_stop").value = "Stop";
}
else
{
localStorage.setItem("started","off");
- generic_browser.runtime.sendMessage("off");
+ chrome.runtime.sendMessage("off");
started = "off";
document.getElementById("start_stop").value = "Start";
}
// if exists reload config tab , to get the start/stop information correct
- if (is_chrome) generic_browser.tabs.query({currentWindow: true},reloadConfigTab);
- else {
- var promise_tabs = generic_browser.tabs.query({currentWindow: true});
- promise_tabs.then(reloadConfigTab);
- }
-
+ chrome.tabs.query({currentWindow: true},reloadConfigTab);
+
}
@@ -68,11 +51,11 @@ function reloadConfigTab(tabs)
// search for config tab
for (let tab of tabs)
{
- if (tab.url.startsWith(generic_browser.extension.getURL(""))) config_tab = tab;
+ if (tab.url.startsWith(chrome.extension.getURL(""))) config_tab = tab;
}
// config tab exists , reload it
- if (config_tab) generic_browser.tabs.reload(config_tab.id);
+ if (config_tab) chrome.tabs.reload(config_tab.id);
}
@@ -80,11 +63,7 @@ function reloadConfigTab(tabs)
function start_config()
{
- if (is_chrome) generic_browser.tabs.query({currentWindow: true},loadConfigTab);
- else {
- var promise_tabs = generic_browser.tabs.query({currentWindow: true});
- promise_tabs.then(loadConfigTab);
- }
+ chrome.tabs.query({currentWindow: true},loadConfigTab);
}
@@ -95,17 +74,13 @@ function loadConfigTab(tabs)
// search for config tab
for (let tab of tabs)
{
- if (tab.url.startsWith(generic_browser.extension.getURL(""))) config_tab = tab;
+ if (tab.url.startsWith(chrome.extension.getURL(""))) config_tab = tab;
}
// config tab exits , put the focus on it
- if (config_tab) generic_browser.tabs.update(config_tab.id,{active:true})
+ if (config_tab) chrome.tabs.update(config_tab.id,{active:true})
// else create a new tab
- else
- {
-console.log("is chrome=" + is_chrome);
- if (is_chrome) generic_browser.tabs.create({url:"popup/config.html"});
- else generic_browser.tabs.create({url:"config.html"});
- }
+ else chrome.tabs.create({url:"/popup/config.html"});
+
}
--
GitLab