ui

extension/common.js

@@ -416,28 +416,26 @@ chrome.contextMenus.onClicked.addListener(info => chrome.storage.local.set({
 
 /* FAQs & Feedback */
 {
-  const {onInstalled, setUninstallURL, getManifest} = chrome.runtime;
+  const {management, runtime: {onInstalled, setUninstallURL, getManifest}, storage, tabs} = chrome;
-  const {name, version} = getManifest();
-  const page = getManifest().homepage_url;
   if (navigator.webdriver !== true) {
+    const page = getManifest().homepage_url;
+    const {name, version} = getManifest();
     onInstalled.addListener(({reason, previousVersion}) => {
-      chrome.storage.local.get({
+      management.getSelf(({installType}) => installType === 'normal' && storage.local.get({
         'faqs': true,
         'last-update': 0
       }, prefs => {
         if (reason === 'install' || (prefs.faqs && reason === 'update')) {
           const doUpdate = (Date.now() - prefs['last-update']) / 1000 / 60 / 60 / 24 > 45;
           if (doUpdate && previousVersion !== version) {
-            chrome.tabs.create({
+            tabs.create({
-              url: page + '?version=' + version +
+              url: page + '?version=' + version + (previousVersion ? '&p=' + previousVersion : '') + '&type=' + reason,
-                (previousVersion ? '&p=' + previousVersion : '') +
-                '&type=' + reason,
               active: reason === 'install'
             });
-            chrome.storage.local.set({'last-update': Date.now()});
+            storage.local.set({'last-update': Date.now()});
           }
         }
-      });
+      }));
     });
     setUninstallURL(page + '?rd=feedback&name=' + encodeURIComponent(name) + '&version=' + version);
   }

extension/data/popup/index.css

@@ -93,8 +93,7 @@ select {
 }
 #list {
   overflow: auto;
-  height: 268px;
+  height: 240px;
-  margin-bottom: 16px;
   color: #000;
   background-position: top 120px center;
   background-repeat: no-repeat;
@@ -177,7 +176,7 @@ select {
 #agent {
   white-space: nowrap;
   display: grid;
-  grid-template-columns: repeat(7, 1fr);
+  grid-template-columns: repeat(4, 1fr);
   grid-gap: 1px;
 }
 

extension/data/popup/index.html

@@ -121,12 +121,13 @@
       </table>
     </div>
     <div id="explore" data-cols=4></div>
-    <div hbox id="agent" align="center">
+    <div id="agent" align="center">
       <input type="button" value="Options" title="Open options page" style="margin-left: 2px;" data-cmd="options">
       <input type="button" value="Restart" title="Click to reload the extension. This will cause all the window-based user-agent strings to be cleared" data-cmd="reload">
       <input type="button" value="Refresh Tab" title="Refresh the current page" data-cmd="refresh">
       <input type="button" value="Reset" title="Reset User-Agent string to the default one. This will not reset window-based UA strings. To reset them, use the 'Restart' button" data-cmd="reset">
       <input type="button" value="Test" title="Test your user-agent string" data-cmd="test">
+      <span></span>
       <input type="button" value="Window" title="Set this string as this window's User-Agent string" data-cmd="window">
       <input type="button" value="Apply" title="Set this string as the browser's User-Agent string" data-cmd="apply">
     </div>

extension/data/popup/index.js

@@ -43,7 +43,8 @@ function update(ua) {
   tbody.textContent = '';
 
   parent.dataset.loading = true;
-  fetch('browsers/' + browser.toLowerCase() + '-' + os.toLowerCase().replace(/\//g, '-') + '.json').then(r => r.json()).catch(e => {
+  fetch('browsers/' + browser.toLowerCase() + '-' + os.toLowerCase().replace(/\//g, '-') + '.json')
+    .then(r => r.json()).catch(e => {
       console.error(e);
       return [];
     }).then(list => {