cssnr · smashedr · Dec 9, 2023 · Dec 9, 2023
diff --git a/src/css/options.css b/src/css/options.css
diff --git a/src/html/options.html b/src/html/options.html
@@ -4,7 +4,6 @@
     <title>SMWC Web Extension</title>
     <link rel="icon" href="../images/logo16.png" sizes="any">
     <link rel="stylesheet" type="text/css" href="../dist/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../css/options.css">
     <script type="text/javascript" src="../js/theme.js"></script>
 </head>
 <body>
@@ -24,10 +23,7 @@ <h1 class="align-middle">SMWC Web Extension</h1>
         <caption class="visually-hidden">Keyboard Shortcuts</caption>
         <thead class="visually-hidden"><tr><th>Description</th><th>Shortcut</th></tr></thead>
         <tbody>
-        <tr>
-            <td>Show Popup Action</td>
-            <td class="text-end"><kbd id="mainKey">Unknown</kbd></td>
-        </tr>
+            <tr><td>Show Popup Action</td><td class="text-end"><kbd id="mainKey">Unknown</kbd></td></tr>
         </tbody>
     </table>
     <hr>

diff --git a/src/html/popup.html b/src/html/popup.html
@@ -42,7 +42,7 @@
     </div>
     <div id="popup-alert" class="alert alert-warning mt-2 visually-hidden" role="alert"></div>
     <hr class="my-2">
-    <form id="options-form">
+    <form id="options-form" class="mb-2">
         <div class="form-check form-switch">
             <input class="form-check-input" type="checkbox" role="switch" id="contextMenu">
             <label class="form-check-label" for="contextMenu">Enable Right Click Menu</label>
@@ -52,7 +52,7 @@
             <label class="form-check-label" for="showUpdate" aria-describedby="showUpdateHelp">Show Release Notes on Update</label>
         </div>
     </form>
-    <a class="btn btn-outline-primary btn-sm w-100 mt-3" role="button" data-href="options">
+    <a class="btn btn-outline-primary btn-sm w-100" role="button" data-href="options">
         Open Options
     </a>
     <hr>

diff --git a/src/js/exports.js b/src/js/exports.js
@@ -1,5 +1,32 @@
 // JS Exports
 
+/**
+ * Patch ROM and open URL at key
+ * TODO: Make Source ROM an Option
+ * @param {String} url
+ * @param {String} key
+ * @param {Function} callback
+ */
+export function patchRom(url, key, callback) {
+    const smwcWorld = 'https://smwc.world/patcher/'
+    const sourceRom =
+        'https://github.com/videofindersTV/super-mario-world/raw/master/Super.Mario.World.1.smc'
+    const formdata = new FormData()
+    formdata.append('patch_url', url)
+    formdata.append('source_url', sourceRom)
+
+    const requestOptions = {
+        method: 'POST',
+        body: formdata,
+        redirect: 'follow',
+    }
+
+    fetch(smwcWorld, requestOptions)
+        .then((response) => response.json())
+        .then((result) => callback(result, key))
+        .catch((error) => console.warn('error', error))
+}
+
 /**
  * Save Options Callback
  * @function saveOptions
@@ -39,30 +66,3 @@ export function updateOptions(options) {
         }
     }
 }
-
-/**
- * Patch ROM and open URL at key
- * TODO: Make Source ROM an Option
- * @param {String} url
- * @param {String} key
- * @param {Function} callback
- */
-export function patchRom(url, key, callback) {
-    const smwcWorld = 'https://smwc.world/patcher/'
-    const sourceRom =
-        'https://github.com/videofindersTV/super-mario-world/raw/master/Super.Mario.World.1.smc'
-    const formdata = new FormData()
-    formdata.append('patch_url', url)
-    formdata.append('source_url', sourceRom)
-
-    const requestOptions = {
-        method: 'POST',
-        body: formdata,
-        redirect: 'follow',
-    }
-
-    fetch(smwcWorld, requestOptions)
-        .then((response) => response.json())
-        .then((result) => callback(result, key))
-        .catch((error) => console.warn('error', error))
-}
diff --git a/src/js/popup.js b/src/js/popup.js
@@ -70,7 +70,7 @@ async function popupLinks(event) {
  */
 async function updateSearchType(event) {
     console.log('updateSearchType:', event)
-    let { popup } = await chrome.storage.sync.get(['popup'])
+    const { popup } = await chrome.storage.sync.get(['popup'])
     popup.searchType = event.target.id
     await chrome.storage.sync.set({ popup })
     const value = document.getElementById('patch-input').value

diff --git a/src/js/service-worker.js b/src/js/service-worker.js
@@ -35,7 +35,7 @@ async function onInstalled(details) {
             if (manifest.version !== details.previousVersion) {
                 const url = `${githubURL}/releases/tag/${manifest.version}`
                 console.log(`url: ${url}`)
-                await chrome.tabs.create({ active: true, url })
+                await chrome.tabs.create({ active: false, url })
             }
         }
     }