From 358cc375214d343129c991a59db61eaaba83e204 Mon Sep 17 00:00:00 2001
From: Keith Bowes <keithbowes@users.noreply.github.com>
Date: Sat, 2 Sep 2017 23:33:50 -0400
Subject: [PATCH] Command keys to open up the options and test pages

---
 webext/background.js | 10 ++++++++++
 webext/manifest.json | 13 +++++++++++++
 webext/options.js    |  1 +
 webext/options.xhtml | 16 ++++++++--------
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/webext/background.js b/webext/background.js
index 964a1e9..e112c46 100644
--- a/webext/background.js
+++ b/webext/background.js
@@ -16,6 +16,13 @@ var Background = {
 
             return {requestHeaders: e.requestHeaders};
         },
+        command: function(cmd)
+        {
+            if ('open-options' == cmd)
+                browser.runtime.openOptionsPage();
+            else if ('open-test' == cmd)
+                browser.browserAction.getPopup({}).then(function(url) { window.open(url); }, null);
+        },
         updated: function(tabId, changeInfo, tab)
         {
             Background.userAgent.set();
@@ -33,6 +40,8 @@ var Background = {
             let pval = Options.hosts[host];
             if (host && pval)
             {
+                browser.browserAction.setTitle({title: Options.hosts[host].description});
+
                 if (pval = pval[prop.toLowerCase()])
                 {
                     return pval;
@@ -66,6 +75,7 @@ var Background = {
     }
 };
 
+browser.commands.onCommand.addListener(Background.events.command);
 browser.tabs.onActivated.addListener(Background.events.activated);
 browser.tabs.onUpdated.addListener(Background.events.updated);
 browser.webRequest.onBeforeSendHeaders.addListener(Background.events.beforeSendHeaders, {urls: ["<all_urls>"]}, ["blocking", "requestHeaders"]);
diff --git a/webext/manifest.json b/webext/manifest.json
index 2d0fa19..539ce98 100644
--- a/webext/manifest.json
+++ b/webext/manifest.json
@@ -22,6 +22,19 @@
     "scripts": ["common.js", "options.js", "background.js"]
   },
 
+  "commands": {
+    "open-options": {
+      "suggested_key": {
+        "default": "Alt+O"
+      }
+    },
+    "open-test": {
+      "suggested_key": {
+        "default": "Ctrl+Shift+U"
+      }
+    }
+  },
+
   "icons": {
     "16": "icons/default-16.png",
     "32": "icons/logo-32.png"
diff --git a/webext/options.js b/webext/options.js
index 5bf5f4b..a8efa6d 100644
--- a/webext/options.js
+++ b/webext/options.js
@@ -128,6 +128,7 @@ var OptionsPage = {
         var ualist = document.createElement('select');
         ualist.id = 'ua-list';
         ualist.size = 10;
+        ualist.tabIndex = 2;
         uacell.appendChild(ualist);
     },
     downloadList: function(e)
diff --git a/webext/options.xhtml b/webext/options.xhtml
index fae2fae..00f4013 100644
--- a/webext/options.xhtml
+++ b/webext/options.xhtml
@@ -11,8 +11,8 @@
     <table id="uaswitch-options">
       <tr>
         <td><label for="ua-file"/></td>
-        <td><input type="text" id="ua-file"/></td>
-        <td><input type="button" id="dl-ua"/></td>
+        <td><input type="text" id="ua-file" tabindex="7"/></td>
+        <td><input type="button" id="dl-ua" tabindex="8"/></td>
       </tr>
       <tr>
         <td id="hosts-cell"/>
@@ -23,18 +23,18 @@
           <table>
             <tr>
               <td>
-                <input type="button" id="move-up"/>
+                <input type="button" id="move-up" tabindex="4"/>
               </td>
               <td>
-                <input type="button" id="move-down"/>
+                <input type="button" id="move-down" tabindex="5"/>
               </td>
             </tr>
             <tr>
               <td>
-                <input type="button" id="add-new"/>
+                <input type="button" id="add-new" tabindex="1"/>
               </td>
               <td>
-                <input type="button" id="delete"/>
+                <input type="button" id="delete" tabindex="3"/>
               </td>
             </tr>
           </table>
@@ -45,8 +45,8 @@
         <td/>
         <td>
           <div id="command-shelf">
-            <input type="button" id="save"/>
-            <input type="button" id="reset"/>
+            <input type="button" id="save" tabindex="6"/>
+            <input type="button" id="reset" tabindex="9"/>
           </div>
         </td>
       </tr>