From 6605d3ea99c364a8f5f9d98a33e3ac89afb035f7 Mon Sep 17 00:00:00 2001 From: chocolateboy Date: Sun, 28 Jul 2019 05:35:07 +0100 Subject: Add an option to close the current tab and select the tab to the left Add an option to tabs.close to close the current tab and select the tab to the left. Bound to `D` by default, which replaces the tabs.close.right command, which is rarely-used. [1] The old `D` behavior has been moved to `gd`. + update the README and fix some lint errors [1] https://tinyurl.com/y4mj7hjy --- e2e/settings.js | 3 ++- e2e/tab.test.js | 20 +++++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'e2e') diff --git a/e2e/settings.js b/e2e/settings.js index e09747f..e3e9787 100644 --- a/e2e/settings.js +++ b/e2e/settings.js @@ -24,7 +24,8 @@ module.exports = { "G": { "type": "scroll.bottom" }, "$": { "type": "scroll.end" }, "d": { "type": "tabs.close" }, - "D": { "type": "tabs.close.right" }, + "D": { "type": "tabs.close", "selectLeft": true }, + "gd": { "type": "tabs.close.right" }, "!d": { "type": "tabs.close.force" }, "u": { "type": "tabs.reopen" }, "K": { "type": "tabs.prev", "count": 1 }, diff --git a/e2e/tab.test.js b/e2e/tab.test.js index 16d61ae..aaaa5d7 100644 --- a/e2e/tab.test.js +++ b/e2e/tab.test.js @@ -55,18 +55,32 @@ describe("tab test", () => { await browser.windows.remove(win.id); }); - it('deletes tab by d', async () => { + it('deletes tab and selects right by d', async () => { + await browser.tabs.update(tabs[3].id, { active: true }); let body = await session.findElementByCSS('body'); await body.sendKeys('d'); let current = await browser.tabs.query({ windowId: win.id }); assert(current.length === tabs.length - 1); + assert(current[3].active); + assert(current[3].url === tabs[4].url); + }); + + it('deletes tab and selects left by D', async () => { + await browser.tabs.update(tabs[3].id, { active: true }); + let body = await session.findElementByCSS('body'); + await body.sendKeys(Key.Shift, 'D'); + + let current = await browser.tabs.query({ windowId: win.id }); + assert(current.length === tabs.length - 1); + assert(current[2].active); + assert(current[2].url === tabs[2].url); }); - it('deletes tabs to the right by D', async () => { + it('deletes all tabs to the right by gD', async () => { await browser.tabs.update(tabs[1].id, { active: true }); let body = await session.findElementByCSS('body'); - await body.sendKeys(Key.Shift, 'd'); + await body.sendKeys('g', Key.Shift, 'D'); let current = await browser.tabs.query({ windowId: win.id }); assert(current.length === 2); -- cgit v1.2.3 From 9a3e8f323797e693c6a5b2d09b1c1b753c8ee5ba Mon Sep 17 00:00:00 2001 From: chocolateboy Date: Wed, 31 Jul 2019 15:01:06 +0100 Subject: tabs.close.right: rename `gd` -> `x$` --- e2e/settings.js | 2 +- e2e/tab.test.js | 4 ++-- src/shared/SettingData.ts | 2 +- src/shared/Settings.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'e2e') diff --git a/e2e/settings.js b/e2e/settings.js index e3e9787..b69e3e7 100644 --- a/e2e/settings.js +++ b/e2e/settings.js @@ -25,7 +25,7 @@ module.exports = { "$": { "type": "scroll.end" }, "d": { "type": "tabs.close" }, "D": { "type": "tabs.close", "selectLeft": true }, - "gd": { "type": "tabs.close.right" }, + "x$": { "type": "tabs.close.right" }, "!d": { "type": "tabs.close.force" }, "u": { "type": "tabs.reopen" }, "K": { "type": "tabs.prev", "count": 1 }, diff --git a/e2e/tab.test.js b/e2e/tab.test.js index aaaa5d7..c82890e 100644 --- a/e2e/tab.test.js +++ b/e2e/tab.test.js @@ -77,10 +77,10 @@ describe("tab test", () => { assert(current[2].url === tabs[2].url); }); - it('deletes all tabs to the right by gD', async () => { + it('deletes all tabs to the right by x$', async () => { await browser.tabs.update(tabs[1].id, { active: true }); let body = await session.findElementByCSS('body'); - await body.sendKeys('g', Key.Shift, 'D'); + await body.sendKeys('x', '$'); let current = await browser.tabs.query({ windowId: win.id }); assert(current.length === 2); diff --git a/src/shared/SettingData.ts b/src/shared/SettingData.ts index 94d1e21..e6434a2 100644 --- a/src/shared/SettingData.ts +++ b/src/shared/SettingData.ts @@ -354,7 +354,7 @@ export const DefaultSettingData: SettingData = SettingData.valueOf({ "$": { "type": "scroll.end" }, "d": { "type": "tabs.close" }, "D": { "type": "tabs.close", "selectLeft": true }, - "gd": { "type": "tabs.close.right" }, + "x$": { "type": "tabs.close.right" }, "!d": { "type": "tabs.close.force" }, "u": { "type": "tabs.reopen" }, "K": { "type": "tabs.prev" }, diff --git a/src/shared/Settings.ts b/src/shared/Settings.ts index c51cbc5..19101c1 100644 --- a/src/shared/Settings.ts +++ b/src/shared/Settings.ts @@ -147,7 +147,7 @@ export const DefaultSetting: Settings = { '$': { 'type': 'scroll.end' }, 'd': { 'type': 'tabs.close' }, 'D': { 'type': 'tabs.close', 'selectLeft': true }, - 'gd': { 'type': 'tabs.close.right' }, + 'x$': { 'type': 'tabs.close.right' }, '!d': { 'type': 'tabs.close.force' }, 'u': { 'type': 'tabs.reopen' }, 'K': { 'type': 'tabs.prev' }, -- cgit v1.2.3 From f65c068c67371f00b7853b4790b926e672f3ca4f Mon Sep 17 00:00:00 2001 From: chocolateboy Date: Wed, 31 Jul 2019 16:17:37 +0100 Subject: tabs.close: rename selectLeft (boolean) -> select ("left" | "right") before: { "type": "tabs.close", "selectLeft": true | false // (default: false) } after: { "type": "tabs.close", "select": "left" | "right" // (default: "right") } --- e2e/settings.js | 2 +- src/background/controllers/OperationController.ts | 2 +- src/settings/keymaps.ts | 2 +- src/shared/SettingData.ts | 2 +- src/shared/Settings.ts | 2 +- src/shared/operations.ts | 19 ++++++++++++++++--- 6 files changed, 21 insertions(+), 8 deletions(-) (limited to 'e2e') diff --git a/e2e/settings.js b/e2e/settings.js index b69e3e7..e78add0 100644 --- a/e2e/settings.js +++ b/e2e/settings.js @@ -24,7 +24,7 @@ module.exports = { "G": { "type": "scroll.bottom" }, "$": { "type": "scroll.end" }, "d": { "type": "tabs.close" }, - "D": { "type": "tabs.close", "selectLeft": true }, + "D": { "type": "tabs.close", "select": "left" }, "x$": { "type": "tabs.close.right" }, "!d": { "type": "tabs.close.force" }, "u": { "type": "tabs.reopen" }, diff --git a/src/background/controllers/OperationController.ts b/src/background/controllers/OperationController.ts index 9480ed5..7a10ad6 100644 --- a/src/background/controllers/OperationController.ts +++ b/src/background/controllers/OperationController.ts @@ -32,7 +32,7 @@ export default class OperationController { doOperation(operation: operations.Operation): Promise { switch (operation.type) { case operations.TAB_CLOSE: - return this.tabUseCase.close(false, operation.selectLeft); + return this.tabUseCase.close(false, operation.select === 'left'); case operations.TAB_CLOSE_RIGHT: return this.tabUseCase.closeRight(); case operations.TAB_CLOSE_FORCE: diff --git a/src/settings/keymaps.ts b/src/settings/keymaps.ts index b9a08e6..24ba1a5 100644 --- a/src/settings/keymaps.ts +++ b/src/settings/keymaps.ts @@ -18,7 +18,7 @@ const fields = [ ['mark.set.prefix', 'Set mark at current position'], ['mark.jump.prefix', 'Jump to the mark'], ], [ - ['tabs.close?{"selectLeft":false}', 'Close a tab'], + ['tabs.close?{"select":"right"}', 'Close a tab'], ['tabs.close.right', 'Close all tabs to the right'], ['tabs.reopen', 'Reopen closed tab'], ['tabs.next', 'Select next tab'], diff --git a/src/shared/SettingData.ts b/src/shared/SettingData.ts index e6434a2..14a7d35 100644 --- a/src/shared/SettingData.ts +++ b/src/shared/SettingData.ts @@ -353,7 +353,7 @@ export const DefaultSettingData: SettingData = SettingData.valueOf({ "G": { "type": "scroll.bottom" }, "$": { "type": "scroll.end" }, "d": { "type": "tabs.close" }, - "D": { "type": "tabs.close", "selectLeft": true }, + "D": { "type": "tabs.close", "select": "left" }, "x$": { "type": "tabs.close.right" }, "!d": { "type": "tabs.close.force" }, "u": { "type": "tabs.reopen" }, diff --git a/src/shared/Settings.ts b/src/shared/Settings.ts index 19101c1..2a392df 100644 --- a/src/shared/Settings.ts +++ b/src/shared/Settings.ts @@ -146,7 +146,7 @@ export const DefaultSetting: Settings = { 'G': { 'type': 'scroll.bottom' }, '$': { 'type': 'scroll.end' }, 'd': { 'type': 'tabs.close' }, - 'D': { 'type': 'tabs.close', 'selectLeft': true }, + 'D': { 'type': 'tabs.close', 'select': 'left' }, 'x$': { 'type': 'tabs.close.right' }, '!d': { 'type': 'tabs.close.force' }, 'u': { 'type': 'tabs.reopen' }, diff --git a/src/shared/operations.ts b/src/shared/operations.ts index f657db1..2df2e67 100644 --- a/src/shared/operations.ts +++ b/src/shared/operations.ts @@ -201,7 +201,7 @@ export interface PageHomeOperation { export interface TabCloseOperation { type: typeof TAB_CLOSE; - selectLeft?: boolean; + select?: 'left' | 'right'; } export interface TabCloseForceOperation { @@ -372,6 +372,19 @@ const assertOptionalBoolean = (obj: any, name: string) => { } }; +const assertOptionalString = (obj: any, name: string, values?: string[]) => { + if (Object.prototype.hasOwnProperty.call(obj, name)) { + let value = obj[name]; + if (typeof value !== 'string') { + throw new TypeError(`Not a string parameter: '${name}'`); + } + if (values && values.length && values.indexOf(value) === -1) { + // eslint-disable-next-line max-len + throw new TypeError(`Invalid parameter for '${name}': '${value}'`); + } + } +}; + const assertRequiredNumber = (obj: any, name: string) => { if (!Object.prototype.hasOwnProperty.call(obj, name) || typeof obj[name] !== 'number') { @@ -418,10 +431,10 @@ export const valueOf = (o: any): Operation => { newTab: Boolean(typeof o.newTab === undefined ? false : o.newTab), }; case TAB_CLOSE: - assertOptionalBoolean(o, 'selectLeft'); + assertOptionalString(o, 'select', ['left', 'right']); return { type: TAB_CLOSE, - selectLeft: Boolean(typeof o.selectLeft === undefined ? false : o.selectLeft), // eslint-disable-line max-len + select: (typeof o.select === undefined ? 'right' : o.select), }; case TAB_RELOAD: assertOptionalBoolean(o, 'cache'); -- cgit v1.2.3