aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/background/actions/operation.js2
-rw-r--r--src/background/tabs.js15
-rw-r--r--src/shared/operations.js1
-rw-r--r--src/shared/settings/default.js1
4 files changed, 16 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
};
diff --git a/src/shared/operations.js b/src/shared/operations.js
index 19466df..4172f8b 100644
--- a/src/shared/operations.js
+++ b/src/shared/operations.js
@@ -33,6 +33,7 @@ export default {
// Tabs
TAB_CLOSE: 'tabs.close',
+ TAB_CLOSE_FORCE: 'tabs.close.force',
TAB_REOPEN: 'tabs.reopen',
TAB_PREV: 'tabs.prev',
TAB_NEXT: 'tabs.next',
diff --git a/src/shared/settings/default.js b/src/shared/settings/default.js
index e81df2b..c85a079 100644
--- a/src/shared/settings/default.js
+++ b/src/shared/settings/default.js
@@ -23,6 +23,7 @@ export default {
"G": { "type": "scroll.bottom" },
"$": { "type": "scroll.end" },
"d": { "type": "tabs.close" },
+ "!d": { "type": "tabs.close.force" },
"u": { "type": "tabs.reopen" },
"K": { "type": "tabs.prev", "count": 1 },
"J": { "type": "tabs.next", "count": 1 },