From c2d2f895a5e65cc7a42da39e7ab8acf73cb03fc8 Mon Sep 17 00:00:00 2001
From: Jiabo Hou <jiabo.hou@hotmail.com>
Date: Tue, 31 Oct 2017 19:37:27 -0400
Subject: added support for pinning/unpinning tabs

features:
 * pin tab
 * unpin tab
 * toggle pin/unpin tab
---
 src/background/actions/operation.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/background/actions/operation.js')

diff --git a/src/background/actions/operation.js b/src/background/actions/operation.js
index a5094c0..c45eabd 100644
--- a/src/background/actions/operation.js
+++ b/src/background/actions/operation.js
@@ -26,6 +26,12 @@ const exec = (operation, tab) => {
     return tabs.selectLastTab();
   case operations.TAB_RELOAD:
     return tabs.reload(tab, operation.cache);
+  case operations.TAB_PIN:
+    return tabs.updateTabPinned(tab, true);
+  case operations.TAB_UNPIN:
+    return tabs.updateTabPinned(tab, false);
+  case operations.TAB_TOGGLE_PINNED:
+    return tabs.updateTabPinned(tab);
   case operations.ZOOM_IN:
     return zooms.zoomIn();
   case operations.ZOOM_OUT:
-- 
cgit v1.2.3


From 87b8280d4bdcaddeac1aff95d9354e1954b7c25a Mon Sep 17 00:00:00 2001
From: Jiabo Hou <jiabo.hou@hotmail.com>
Date: Sun, 5 Nov 2017 17:59:46 -0500
Subject: code review  * change default keybinding for pin/unpin tab from 'p'
 to 'zp'  * use toggleTabPinned to toggle the tab pinned state, instead of
 updateTabPinned

---
 README.md                           |  2 +-
 src/background/actions/operation.js |  6 +++++-
 src/background/tabs.js              | 12 ++++++------
 src/shared/default-settings.js      |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/background/actions/operation.js')

diff --git a/README.md b/README.md
index d53a89e..2d34a06 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ The default mappings are as follows:
 - <kbd>g0</kbd>, <kbd>g$</kbd>: select first or last tab
 - <kbd>r</kbd>: reload current tab
 - <kbd>R</kbd>: reload current tab without cache
-- <kbd>p</kbd>: toggle pin/unpin current tab
+- <kbd>zp</kbd>: toggle pin/unpin current tab
 
 ### Navigation
 - <kbd>f</kbd>: start following links in the page
diff --git a/src/background/actions/operation.js b/src/background/actions/operation.js
index c45eabd..d0caf80 100644
--- a/src/background/actions/operation.js
+++ b/src/background/actions/operation.js
@@ -10,6 +10,9 @@ const sendConsoleShowCommand = (tab, command) => {
   });
 };
 
+// This switch statement is only gonna get longer as more
+// features are added, so disable complexity check
+/* eslint-disable complexity */
 const exec = (operation, tab) => {
   switch (operation.type) {
   case operations.TAB_CLOSE:
@@ -31,7 +34,7 @@ const exec = (operation, tab) => {
   case operations.TAB_UNPIN:
     return tabs.updateTabPinned(tab, false);
   case operations.TAB_TOGGLE_PINNED:
-    return tabs.updateTabPinned(tab);
+    return tabs.toggleTabPinned(tab);
   case operations.ZOOM_IN:
     return zooms.zoomIn();
   case operations.ZOOM_OUT:
@@ -64,5 +67,6 @@ const exec = (operation, tab) => {
     return Promise.resolve();
   }
 };
+/* eslint-enable complexity */
 
 export { exec };
diff --git a/src/background/tabs.js b/src/background/tabs.js
index 38b2ed9..23b3b7b 100644
--- a/src/background/tabs.js
+++ b/src/background/tabs.js
@@ -103,16 +103,16 @@ const reload = (current, cache) => {
 const updateTabPinned = (current, pinned) => {
   return browser.tabs.query({ currentWindow: true, active: true })
     .then(() => {
-      let newPinned = pinned;
-      if (newPinned !== true && newPinned !== false) {
-        newPinned = !current.pinned;
-      }
-      return browser.tabs.update(current.id, { pinned: newPinned });
+      return browser.tabs.update(current.id, { pinned: pinned });
     });
 };
 
+const toggleTabPinned = (current) => {
+  updateTabPinned(current, !current.pinned);
+};
+
 export {
   closeTab, reopenTab, selectAt, selectByKeyword, getCompletions,
   selectPrevTab, selectNextTab, selectFirstTab, selectLastTab, reload,
-  updateTabPinned
+  updateTabPinned, toggleTabPinned
 };
diff --git a/src/shared/default-settings.js b/src/shared/default-settings.js
index 0127933..e45bee6 100644
--- a/src/shared/default-settings.js
+++ b/src/shared/default-settings.js
@@ -32,7 +32,7 @@ export default {
     "g$": { "type": "tabs.last" },
     "r": { "type": "tabs.reload", "cache": false },
     "R": { "type": "tabs.reload", "cache": true },
-    "p": { "type": "tabs.pin.toggle" },
+    "zp": { "type": "tabs.pin.toggle" },
     "zi": { "type": "zoom.in" },
     "zo": { "type": "zoom.out" },
     "zz": { "type": "zoom.neutral" },
-- 
cgit v1.2.3