Merge pull request #2237 from 15cm/master

feat(focus): Add more shortcuts to focus the child/sibling
piroor · Apr 25, 2019 · 6cf394c · 6cf394c
2 parents 4d61ff3 + 2fee120
commit 6cf394c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/webextensions/_locales/en/messages.json b/webextensions/_locales/en/messages.json
@@ -17,6 +17,9 @@
   "command_focusNextSilently":     { "message": "Focus to Next Tab (don't expand tree)" },
   "command_focusParent":           { "message": "Focus to Parent Tab" },
   "command_focusFirstChild":       { "message": "Focus to First Child Tab" },
+  "command_focusLastChild":        { "message": "Focus to Last Child Tab" },
+  "command_focusPreviousSibling":  { "message": "Focus to Previous Sibling Tab" },
+  "command_focusNextSibling":      { "message": "Focus to Next Sibling Tab" },
   "command_tabbarUp":              { "message": "Scroll Tabs Up by Line" },
   "command_tabbarPageUp":          { "message": "Scroll Tabs Up by Page" },
   "command_tabbarHome":            { "message": "Scroll Tabs to Top" },

diff --git a/webextensions/background/handle-misc.js b/webextensions/background/handle-misc.js
@@ -209,6 +209,20 @@ async function onShortcutCommand(command) {
     case 'focusFirstChild':
       TabsInternalOperation.activateTab(activeTab.$TST.firstChild);
       return;
+    case 'focusLastChild':
+      const children = activeTab.$TST.children;
+      if(children.length > 0) {
+        TabsInternalOperation.activateTab(children[children.length - 1]);
+      }
+      return;
+    case 'focusPreviousSibling': {
+      TabsInternalOperation.activateTab(activeTab.$TST.previousSiblingTab);
+      return;
+    }
+    case 'focusNextSibling': {
+      TabsInternalOperation.activateTab(activeTab.$TST.nextSiblingTab);
+      return;
+    }
 
     case 'tabbarUp':
       SidebarConnection.sendMessage({

diff --git a/webextensions/manifest.json b/webextensions/manifest.json
@@ -164,6 +164,15 @@
     "focusFirstChild": {
       "description": "__MSG_command_focusFirstChild__"
     },
+    "focusLastChild": {
+      "description": "__MSG_command_focusLastChild__"
+    },
+    "focusPreviousSibling": {
+      "description": "__MSG_command_focusPreviousSibling__"
+    },
+    "focusNextSibling": {
+      "description": "__MSG_command_focusNextSibling__"
+    },
     "tabbarUp": {
       "description": "__MSG_command_tabbarUp__ (Alt+Shift+Up)"
     },