Merge pull request #236 from r3r57/feature/force_remove_tab

Closing pinned tabs must be forced

2 files changed, 14 insertions, 3 deletions

diff --git a/src/background/actions/operation.js b/src/background/actions/operation.js
index cfee868..1188ea2 100644
--- a/src/background/actions/operation.js
+++ b/src/background/actions/operation.js
@@ -17,6 +17,8 @@ const exec = (operation, tab) => {
   switch (operation.type) {
   case operations.TAB_CLOSE:
     return tabs.closeTab(tab.id);
+  case operations.TAB_CLOSE_FORCE:
+    return tabs.closeTabForce(tab.id);
   case operations.TAB_REOPEN:
     return tabs.reopenTab();
   case operations.TAB_PREV:
diff --git a/src/background/tabs.js b/src/background/tabs.js
index d50d8e5..e939870 100644
--- a/src/background/tabs.js
+++ b/src/background/tabs.js
@@ -9,6 +9,14 @@ browser.tabs.onActivated.addListener((activeInfo) => {
 });
 
 const closeTab = (id) => {
+  return browser.tabs.get(id).then((tab) => {
+    if (!tab.pinned) {
+      return browser.tabs.remove(id);
+    }
+  });
+};
+
+const closeTabForce = (id) => {
   return browser.tabs.remove(id);
 };
 
@@ -130,7 +138,8 @@ const duplicate = (id) => {
 };
 
 export {
-  closeTab, reopenTab, selectAt, selectByKeyword, getCompletions,
-  selectPrevTab, selectNextTab, selectFirstTab, selectLastTab, selectPrevSelTab,
-  reload, updateTabPinned, toggleTabPinned, duplicate
+  closeTab, closeTabForce, reopenTab, selectAt, selectByKeyword,
+  getCompletions, selectPrevTab, selectNextTab, selectFirstTab,
+  selectLastTab, selectPrevSelTab, reload, updateTabPinned,
+  toggleTabPinned, duplicate
 };