From 3e947f5f80b8af9980e2cf159a81cde14f80d41a Mon Sep 17 00:00:00 2001
From: Ray Lothian <ray.lothian@yahoo.com>
Date: Thu, 1 Aug 2019 06:41:28 +0100
Subject: [PATCH] fixes #44

---
 extension/data/popup/index.css |  1 +
 extension/data/popup/index.js  | 26 ++++++++++++++++++++------
 extension/manifest.json        |  7 +------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/extension/data/popup/index.css b/extension/data/popup/index.css
index 59cef40..ec11327 100644
--- a/extension/data/popup/index.css
+++ b/extension/data/popup/index.css
@@ -80,6 +80,7 @@ select {
 }
 #list {
   overflow: auto;
+  scroll-behavior: smooth;
   height: 300px;
   margin-bottom: 10px;
   color: #000;
diff --git a/extension/data/popup/index.js b/extension/data/popup/index.js
index 08c90e0..01af5c8 100644
--- a/extension/data/popup/index.js
+++ b/extension/data/popup/index.js
@@ -2,7 +2,7 @@
 
 document.body.dataset.android = navigator.userAgent.indexOf('Android') !== -1;
 
-var map = {};
+const map = {};
 
 function sort(arr) {
   function sort(a = '', b = '') {
@@ -33,7 +33,7 @@ function sort(arr) {
   return list;
 }
 
-function update() {
+function update(ua) {
   const browser = document.getElementById('browser').value;
   const os = document.getElementById('os').value;
 
@@ -49,6 +49,7 @@ function update() {
   }).then(list => {
     if (list) {
       const fragment = document.createDocumentFragment();
+      let radio;
       for (const o of sort(list)) {
         const clone = document.importNode(t.content, true);
         const second = clone.querySelector('td:nth-child(2)');
@@ -57,9 +58,19 @@ function update() {
         third.title = third.textContent = o.os.name + ' ' + (o.os.version || ' ');
         const forth = clone.querySelector('td:nth-child(4)');
         forth.title = forth.textContent = o.ua;
+        if (o.ua === ua) {
+          radio = clone.querySelector('input[type=radio]');
+        }
         fragment.appendChild(clone);
       }
       tbody.appendChild(fragment);
+      if (radio) {
+        radio.checked = true;
+        radio.scrollIntoView({
+          block: 'center',
+          inline: 'nearest'
+        });
+      }
       document.getElementById('custom').placeholder = `Filter among ${list.length} "User-Agent" strings`;
       [...document.getElementById('os').querySelectorAll('option')].forEach(option => {
         option.disabled = map.matching[browser.toLowerCase()].indexOf(option.value.toLowerCase()) === -1;
@@ -106,7 +117,13 @@ document.addEventListener('DOMContentLoaded', () => fetch('./map.json').then(r =
     document.querySelector('#os optgroup:last-of-type').appendChild(f2);
     document.getElementById('os').value = localStorage.getItem('os') || 'Windows';
 
-    update();
+    chrome.storage.local.get({
+      ua: ''
+    }, prefs => {
+      const ua = prefs.ua || navigator.userAgent;
+      update(ua);
+      document.getElementById('ua').value = ua;
+    });
   }));
 
 document.getElementById('list').addEventListener('click', ({target}) => {
@@ -128,9 +145,6 @@ document.getElementById('custom').addEventListener('keyup', ({target}) => {
     .forEach(tr => tr.dataset.matched = tr.textContent.toLowerCase().indexOf(value.toLowerCase()) !== -1);
 });
 
-chrome.storage.local.get({
-  ua: ''
-}, prefs => document.getElementById('ua').value = prefs.ua || navigator.userAgent);
 chrome.storage.onChanged.addListener(prefs => {
   if (prefs.ua) {
     document.getElementById('ua').value = prefs.ua.newValue || navigator.userAgent;
diff --git a/extension/manifest.json b/extension/manifest.json
index 9050216..15600ed 100755
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -54,10 +54,5 @@
     "match_about_blank": true,
     "matches": ["*://*/*"],
     "js": ["data/inject.js"]
-  }],
-  "applications": {
-    "gecko": {
-      "id": "{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}"
-    }
-  }
+  }]
 }