From 3cb3e92e55c4f22aaa7e520fea1a1d8fdbef72b4 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 8 Apr 2020 01:04:41 -0400 Subject: Update tortm-browser-button extension to 0.1.8. * data/extensions/tortm-browser-button@jeremybenthum/META-INF/manifest.mf, data/extensions/tortm-browser-button@jeremybenthum/META-INF/mozilla.rsa, data/extensions/tortm-browser-button@jeremybenthum/META-INF/mozilla.sf, data/extensions/tortm-browser-button@jeremybenthum/data/popup/explore/explore.css, data/extensions/tortm-browser-button@jeremybenthum/data/popup/explore/explore.js, data/extensions/tortm-browser-button@jeremybenthum/data/popup/explore/explore.json, data/extensions/tortm-browser-button@jeremybenthum/data/popup/icons/install.png, data/extensions/tortm-browser-button@jeremybenthum/data/popup/icons/ip.png, data/extensions/tortm-browser-button@jeremybenthum/data/popup/icons/reload.png, data/extensions/tortm-browser-button@jeremybenthum/data/popup/icons/support.png, data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.css, data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.html, data/extensions/tortm-browser-button@jeremybenthum/data/popup/popup.js, data/extensions/tortm-browser-button@jeremybenthum/lib/chrome/chrome.js, data/extensions/tortm-browser-button@jeremybenthum/lib/common.js, data/extensions/tortm-browser-button@jeremybenthum/lib/config.js, data/extensions/tortm-browser-button@jeremybenthum/manifest.json: Update. --- .../lib/common.js | 106 ++++++++++----------- 1 file changed, 52 insertions(+), 54 deletions(-) (limited to 'data/extensions/tortm-browser-button@jeremybenthum/lib/common.js') diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js index ae1ed5a..7d95722 100644 --- a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js +++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js @@ -1,88 +1,86 @@ -window.setTimeout(function () { - var version = config.welcome.version; - if (!version) { -// app.tab.open(app.homepage() + "?v=" + app.version() + "&type=install"); - config.welcome.version = app.version(); - } -}, 3000); - -var popupsend = function () { - tor.icon(tor.id); - app.popup.send("tor-data", { - "id": tor.id, - "log": tor.log, - "whitelist": config.addon.whitelist - }); -}; - -var setproxy = function (callback) { - if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"mode": "system"}}, callback); - else chrome.proxy.settings.set({ - "scope": "regular", - "value": { - "mode": "fixed_servers", - "rules": { - "bypassList": tor.bypassList, - "singleProxy": {"scheme": "socks5", "host": "127.0.0.1", "port": 9050} - } +var core = { + "popup": { + "send": function () { + tor.icon(tor.id); + app.popup.send("tor-data", { + "id": tor.id, + "log": tor.log, + "whitelist": config.addon.whitelist + }); + } + }, + "apply": { + "proxy": function (callback) { + if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"mode": "system"}}, callback); + else chrome.proxy.settings.set({ + "scope": "regular", + "value": { + "mode": "fixed_servers", + "rules": { + "bypassList": tor.bypassList, + "singleProxy": {"scheme": "socks5", "host": "127.0.0.1", "port": 9050} + } + } + }, callback); } - }, callback); + } }; var tor = { "id": "OFF", "bypassList": [], - "log": "Tor Browser Button", - "update": function () { - if (config.addon.state === "ON") { - tor.once(function () { - var url = config.addon.check + "?t=" + new Date().getTime() + "&r=" + Math.round(Math.random() * 10000); - config.request(url, function (e) { - if (e === "ok") config.addon.state === "ON" ? tor.start() : tor.stop(); - else { - tor.stop(); - config.notifications.create("TOR is NOT running. Please connect your computer to TOR network and try again."); - } - }); - }); - } else tor.stop(); - }, + "log": "Onion Browser Button", "stop": function () { tor.id = "OFF"; tor.log = "TOR proxy is disabled"; - setproxy(popupsend); + core.apply.proxy(core.popup.send); }, "start": function () { tor.id = "ON"; tor.log = "Connected to 127.0.0.1:9050"; config.notifications.create("TOR is running. Connected to 127.0.0.1:9050"); tor.bypassList = config.addon.whitelist ? config.addon.whitelist.split(',') : []; - setproxy(popupsend); + core.apply.proxy(core.popup.send); }, "once": function (callback) { tor.id = "CHECK"; tor.log = "Checking tor proxy connection..."; tor.bypassList = config.addon.whitelist ? config.addon.whitelist.split(',') : []; - setproxy(function () {window.setTimeout(function () {callback(true)}, 300)}); - popupsend(); + core.apply.proxy(function () {window.setTimeout(function () {callback(true)}, 300)}); + core.popup.send(); }, "icon": function (state) { app.button.icon = { "path": { - "16": '../../data/icons/' + state + '/16.png', - "32": '../../data/icons/' + state + '/32.png', - "48": '../../data/icons/' + state + '/48.png', - "64": '../../data/icons/' + state + '/64.png' + "16": "../../data/icons/" + (state ? state + "/" : '') + "16.png", + "32": "../../data/icons/" + (state ? state + "/" : '') + "32.png", + "48": "../../data/icons/" + (state ? state + "/" : '') + "48.png", + "64": "../../data/icons/" + (state ? state + "/" : '') + "64.png" } }; + }, + "update": function () { + if (config.addon.state === "ON") { + tor.once(function () { + var url = config.url.tor + "?t=" + new Date().getTime() + "&r=" + Math.round(Math.random() * 10000); + config.request(url, function (e) { + if (e === "ok") config.addon.state === "ON" ? tor.start() : tor.stop(); + else { + tor.stop(); + config.notifications.create("TOR is NOT running. Please connect your computer to TOR network and try again."); + } + }); + }); + } else tor.stop(); } }; app.popup.receive("popup-data", function (e) { if (e.name === "reload") app.tab.reload(); + if (e.name === "ip") app.tab.open(config.url.ip); + if (e.name === "check") app.tab.open(config.url.tor); if (e.name === "support") app.tab.open(app.homepage()); - if (e.name === "check") app.tab.open(config.addon.check); - if (e.name === "install") app.tab.open(config.addon.github); + if (e.name === "install") app.tab.open(config.url.github); if (e.name === "bypassList") { config.addon.whitelist = e.whitelist; tor.update(); @@ -94,4 +92,4 @@ app.popup.receive("popup-data", function (e) { }); window.setTimeout(tor.update, 0); -app.popup.receive("load", popupsend); +app.popup.receive("load", core.popup.send); -- cgit v1.2.3