minor cleanup

Author: ushi-as

background.js

@@ -1 +1,12 @@
-trektorRuntime.onMessage((args) => fetch(...args).then((response) => response.json()));
+trektor.runtime.onMessage((msg) => {
+  switch (msg.action) {
+    case 'fetchJSON':
+      return fetchJSON(...msg.args);
+    default:
+      return Promise.reject('unknown action');
+  }
+});
+
+function fetchJSON(url, options = {}) {
+  return fetch(url, options).then((response) => response.json());
+}

content_script.js

@@ -29,7 +29,7 @@ const mappings = {
 
 function onClick() {
     let trelloApiKey = "afadffe77f745496f80ebb4bf460c615"
-    trektorStorage.get(['trello', 'toggl']).then(result => {
+    trektor.storage.get(['trello', 'toggl']).then(result => {
         const trelloToken = result.trello
         const togglToken = result.toggl
 
@@ -86,12 +86,12 @@ function onClick() {
 
             url = new URL("https://api.track.toggl.com/api/v8/workspaces")
             const togglAuth = btoa(`${togglToken}:api_token`)
-            trektorRuntime.sendMessage([url.toString(), {
+            trektor.fetchJSON(url.toString(), {
                 headers: {
                     'Authorization': `Basic ${togglAuth}`,
                     'Content-Type': 'application/json'
                 }
-            }]).then(response => {
+            }).then(response => {
                 for (var i in response) {
                     if (response[i]["name"] == "aboutsource") {
                         var wid = response[i]["id"]
@@ -103,12 +103,12 @@ function onClick() {
                 }
 
                 url = new URL(`https://api.track.toggl.com/api/v8/workspaces/${wid}/projects`)
-                trektorRuntime.sendMessage([url.toString(), {
+                trektor.fetchJSON(url.toString(), {
                     headers: {
                         'Authorization': `Basic ${togglAuth}`,
                         'Content-Type': 'application/json'
                     }
-                }]).then(response => {
+                }).then(response => {
                     for (var i in response) {
                         if (response[i]["name"].endsWith(`(${labelShort})`)) {
                             var pid = response[i]["id"]
@@ -120,14 +120,14 @@ function onClick() {
                                     "pid": pid
                                 }
                             }
-                            trektorRuntime.sendMessage([url.toString(), {
+                            trektor.fetchJSON(url.toString(), {
                                 method: 'POST',
                                 headers: {
                                     'Authorization': `Basic ${togglAuth}`,
                                     'Content-Type': 'application/json'
                                 },
                                 body: JSON.stringify(data)
-                            }])
+                            })
                         }
                     }
                 })

manifest.json

@@ -13,14 +13,14 @@
         "*://trello.com/*"
       ],
       "js": [
-        "storage.js",
+        "trektor.js",
         "content_script.js"
       ]
     }
   ],
   "background": {
     "scripts": [
-      "storage.js",
+      "trektor.js",
       "background.js"
     ]
   },

options/index.html

@@ -13,7 +13,7 @@ <h2>Trektor settings</h2>
       Trello Token generieren</a><br>
     <input type="text" id='trello_token' name="trello" class="chrome-style browser-style" aria-label="Trello Token"/><br><a href="https://track.toggl.com/profile">Toggl Token (ziemlich weit runter scrollen)</a> <br>
     <input type="text" id="toggl_token" name="toggl" /><br><br><br>
-    <script src="../storage.js"></script>
+    <script src="../trektor.js"></script>
     <script src="./script.js"></script>
   </body>
 </html>

options/script.js

@@ -5,10 +5,10 @@ trelloTextField.addEventListener("input", onChange)
 togglTextField.addEventListener("input", onChange)
 
 function onChange(e) {
-    trektorStorage.set({[e.target.name]: e.target.value});
+    trektor.storage.set({[e.target.name]: e.target.value});
 }
 
-trektorStorage.get(['trello', 'toggl']).then(result => {
+trektor.storage.get(['trello', 'toggl']).then(result => {
     trelloTextField.value = result.trello;
     togglTextField.value = result.toggl;
 })

storage.js trektor.jsstorage.js renamed to trektor.js

@@ -33,10 +33,22 @@ class ChromeRuntime {
   }
 }
 
+window.trektor = {
+  storage: null,
+  runtime: null,
+
+  fetchJSON(url, options = {}) {
+    return this.runtime.sendMessage({
+      action: 'fetchJSON',
+      args: [url, options],
+    });
+  },
+};
+
 if (window.chrome !== undefined) {
-  window.trektorStorage = new ChromeStorage();
-  window.trektorRuntime = new ChromeRuntime();
+  window.trektor.storage = new ChromeStorage();
+  window.trektor.runtime = new ChromeRuntime();
 } else {
-  window.trektorStorage = browser.storage.local;
-  window.trektorRuntime = browser.runtime;
+  window.trektor.storage = browser.storage.local;
+  window.trektor.runtime = browser.runtime;
 }