From 0420a29d77e7e91a87f8f70623e1dff067640fd8 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 18 Jan 2021 14:22:48 -0500
Subject: [PATCH] Command refactor (#1271)

* Change selectors

* Change openHelpPage to openInfoPage
---
 dev/data/manifest-variants.json | 2 +-
 ext/bg/context.html             | 8 ++++----
 ext/bg/js/backend.js            | 4 ++--
 ext/bg/js/context-main.js       | 4 ++--
 ext/manifest.json               | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev/data/manifest-variants.json b/dev/data/manifest-variants.json
index 757066f0..d0a2929b 100644
--- a/dev/data/manifest-variants.json
+++ b/dev/data/manifest-variants.json
@@ -93,7 +93,7 @@
                 },
                 "description": "Toggle text scanning on/off"
             },
-            "openHelpPage": {
+            "openInfoPage": {
                 "description": "Open the help page"
             },
             "openSettingsPage": {
diff --git a/ext/bg/context.html b/ext/bg/context.html
index 15e3500d..4b2bcb8c 100644
--- a/ext/bg/context.html
+++ b/ext/bg/context.html
@@ -30,9 +30,9 @@
                 <optgroup label="Primary Profile" id="profile-select-option-group"></optgroup>
             </select></span>
         </button>
-        <a class="nav-button action-open-options" data-icon="cog" title="Options&#10;(Middle click to open in new tab)"></a>
+        <a class="nav-button action-open-settings" data-icon="cog" title="Options&#10;(Middle click to open in new tab)"></a>
         <a class="nav-button action-open-search" data-icon="magnifying-glass" title="Search (Alt + Insert)&#10;(Middle click to open in new tab)"></a>
-        <a class="nav-button action-open-help" data-icon="question-mark" title="Information"></a>
+        <a class="nav-button action-open-info" data-icon="question-mark" title="Information"></a>
     </div>
 </div>
 
@@ -41,13 +41,13 @@
     <label class="link-group">
         <span class="link-group-icon"><input type="checkbox" id="enable-search2"></span><span class="link-group-label">Enable content scanning</span>
     </label>
-    <a class="link-group action-open-options">
+    <a class="link-group action-open-settings">
         <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label">Options</span>
     </a>
     <a class="link-group action-open-search">
         <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label">Search</span>
     </a>
-    <a class="link-group action-open-help">
+    <a class="link-group action-open-info">
         <span class="link-group-icon" data-icon="chevron"></span><span class="link-group-label">Help</span>
     </a>
 </div>
diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index d83942c0..a426d04c 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -132,7 +132,7 @@ class Backend {
 
         this._commandHandlers = new Map([
             ['toggleTextScanning', this._onCommandToggleTextScanning.bind(this)],
-            ['openHelpPage',       this._onCommandOpenHelpPage.bind(this)],
+            ['openInfoPage',       this._onCommandOpenInfoPage.bind(this)],
             ['openSettingsPage',   this._onCommandOpenSettingsPage.bind(this)],
             ['openSearchPage',     this._onCommandOpenSearchPage.bind(this)],
             ['openPopupWindow',    this._onCommandOpenPopupWindow.bind(this)]
@@ -774,7 +774,7 @@ class Backend {
         }
     }
 
-    async _onCommandOpenHelpPage() {
+    async _onCommandOpenInfoPage() {
         await this._openInfoPage();
     }
 
diff --git a/ext/bg/js/context-main.js b/ext/bg/js/context-main.js
index 1d15a81b..839b534e 100644
--- a/ext/bg/js/context-main.js
+++ b/ext/bg/js/context-main.js
@@ -30,13 +30,13 @@ class DisplayController {
         this._showExtensionInfo(manifest);
         this._setupEnvironment();
         this._setupButtonEvents('.action-open-search', 'openSearchPage', chrome.runtime.getURL('/bg/search.html'));
-        this._setupButtonEvents('.action-open-help', 'openHelpPage', chrome.runtime.getURL('/bg/info.html'));
+        this._setupButtonEvents('.action-open-info', 'openInfoPage', chrome.runtime.getURL('/bg/info.html'));
 
         const optionsFull = await api.optionsGetFull();
         this._optionsFull = optionsFull;
 
         const optionsPageUrl = optionsFull.global.useSettingsV2 ? '/bg/settings2.html' : manifest.options_ui.page;
-        this._setupButtonEvents('.action-open-options', 'openSettingsPage', chrome.runtime.getURL(optionsPageUrl));
+        this._setupButtonEvents('.action-open-settings', 'openSettingsPage', chrome.runtime.getURL(optionsPageUrl));
 
         const {profiles, profileCurrent} = optionsFull;
         const primaryProfile = (profileCurrent >= 0 && profileCurrent < profiles.length) ? profiles[profileCurrent] : null;
diff --git a/ext/manifest.json b/ext/manifest.json
index 495044a4..8a8822df 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -92,8 +92,8 @@
             },
             "description": "Toggle text scanning on/off"
         },
-        "openHelpPage": {
-            "description": "Open the help page"
+        "openInfoPage": {
+            "description": "Open the info page"
         },
         "openSettingsPage": {
             "description": "Open the settings page"