From 4e24defd1b658dbfb85320e23b09dc1c0b6ad87b Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Wed, 21 Oct 2020 17:14:56 +0800
Subject: import(ProxyChanger): Allow to set proxy url.

---
 works/ProxyChanger/popup/popup.html |  2 ++
 works/ProxyChanger/popup/popup.js   | 53 ++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 21 deletions(-)

(limited to 'works/ProxyChanger/popup')

diff --git a/works/ProxyChanger/popup/popup.html b/works/ProxyChanger/popup/popup.html
index 8f082df..16e4bd0 100644
--- a/works/ProxyChanger/popup/popup.html
+++ b/works/ProxyChanger/popup/popup.html
@@ -10,6 +10,8 @@
     <div id="direct_button" class="button">Direct</div>
     <div id="system_button" class="button">System</div>
     <div id="proxy_button" class="button">Proxy</div>
+    <hr />
+    <div id="settings_button" class="button">Settings</div>
     <script src="popup.js"></script>
   </body>
 </html>
diff --git a/works/ProxyChanger/popup/popup.js b/works/ProxyChanger/popup/popup.js
index 31c1384..0615035 100644
--- a/works/ProxyChanger/popup/popup.js
+++ b/works/ProxyChanger/popup/popup.js
@@ -22,26 +22,37 @@ browser.proxy.settings.get({}).then(({ value }) => {
   }
 });
 
-const proxyConfigs = {
-  direct: {
-    proxyType: "none",
-  },
-  system: {
-    proxyType: "system",
-  },
-  proxy: {
-    proxyType: "manual",
-    http: "http://localhost:8888",
-    httpProxyAll: true,
-  },
-};
+browser.storage.local.get("proxyUrl").then(({ proxyUrl }) => {
+  console.log("Saved proxy url is ", proxyUrl);
+
+  const proxyConfigs = {
+    direct: {
+      proxyType: "none",
+    },
+    system: {
+      proxyType: "system",
+    },
+    proxy: {
+      proxyType: "manual",
+      http: proxyUrl,
+      httpProxyAll: true,
+    },
+  };
 
-for (const key in buttons) {
-  buttons[key].addEventListener("click", () => {
-    browser.proxy.settings.set({ value: proxyConfigs[key] }).then((success) => {
-      if (success) {
-        setSelectedButton(key);
-      }
+  for (const key in buttons) {
+    buttons[key].addEventListener("click", () => {
+      console.log("Try to set proxy to ", proxyConfigs[key]);
+      browser.proxy.settings
+        .set({ value: proxyConfigs[key] })
+        .then((success) => {
+          if (success) {
+            setSelectedButton(key);
+          }
+        });
     });
-  });
-}
+  }
+});
+
+document.getElementById("settings_button").addEventListener("click", () => {
+  browser.runtime.openOptionsPage();
+});
-- 
cgit v1.2.3