From 5a082b4ea51d283a20c5499c13fd48d9bed67fd2 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Sun, 13 Aug 2017 21:32:24 +0900 Subject: add command-line bar --- src/shared/actions.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/shared') diff --git a/src/shared/actions.js b/src/shared/actions.js index 3e3cbd0..4c9fec4 100644 --- a/src/shared/actions.js +++ b/src/shared/actions.js @@ -1,3 +1,4 @@ +export const CMD_OPEN = 'cmd.open'; export const TABS_PREV = 'tabs.prev'; export const TABS_NEXT = 'tabs.next'; export const SCROLL_UP = 'scroll.up'; @@ -11,6 +12,7 @@ const BACKGROUND_ACTION_SET = new Set([ ]); const CONTENT_ACTION_SET = new Set([ + CMD_OPEN, SCROLL_UP, SCROLL_DOWN, SCROLL_TOP, -- cgit v1.2.3 From 36680ed8fe1d2b3d703affe400eb7e42a00e0df3 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 15 Aug 2017 22:00:05 +0900 Subject: implement o/O command --- src/background/index.js | 6 +++++- src/background/key-queue.js | 2 ++ src/content/footer-line.js | 3 ++- src/content/index.js | 44 ++++++++++++++++++++++++++++---------------- src/shared/actions.js | 2 ++ 5 files changed, 39 insertions(+), 18 deletions(-) (limited to 'src/shared') diff --git a/src/background/index.js b/src/background/index.js index e8882c5..8544c0f 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -36,7 +36,11 @@ const doBackgroundAction = (sender, action) => { } const normalizeUrl = (string) => { - return 'http://' + string; + try { + return new URL(string).href + } catch (e) { + return 'http://' + string; + } } const cmdEnterHandle = (request, sender) => { diff --git a/src/background/key-queue.js b/src/background/key-queue.js index acbb6e0..3f25791 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -3,6 +3,8 @@ import * as actions from '../shared/actions'; const DEFAULT_KEYMAP = [ { keys: [{ code: KeyboardEvent.DOM_VK_SEMICOLON, shift: true }], action: [ actions.CMD_OPEN ]}, + { keys: [{ code: KeyboardEvent.DOM_VK_O }], action: [ actions.CMD_TABS_OPEN, false ]}, + { keys: [{ code: KeyboardEvent.DOM_VK_O, shift: true }], action: [ actions.CMD_TABS_OPEN, true ]}, { keys: [{ code: KeyboardEvent.DOM_VK_K }], action: [ actions.SCROLL_UP, 1 ]}, { keys: [{ code: KeyboardEvent.DOM_VK_J }], action: [ actions.SCROLL_DOWN, 1 ]}, { keys: [{ code: KeyboardEvent.DOM_VK_G }, { code: KeyboardEvent.DOM_VK_G }], action: [ actions.SCROLL_TOP ]}, diff --git a/src/content/footer-line.js b/src/content/footer-line.js index 39d8eaf..fc1dc7b 100644 --- a/src/content/footer-line.js +++ b/src/content/footer-line.js @@ -1,7 +1,7 @@ import './footer-line.css'; export default class FooterLine { - constructor(doc) { + constructor(doc, initial = '') { this.initUi(doc); this.enteredCallback = () => {} @@ -10,6 +10,7 @@ export default class FooterLine { this.input.addEventListener('blur', this.handleBlur.bind(this)); this.input.addEventListener('keydown', this.handleKeydown.bind(this)); this.input.addEventListener('keyup', this.handleKeyup.bind(this)); + this.input.value = initial; } initUi(doc) { diff --git a/src/content/index.js b/src/content/index.js index ed33961..17ab308 100644 --- a/src/content/index.js +++ b/src/content/index.js @@ -4,6 +4,25 @@ import * as actions from '../shared/actions'; var footer = null; +const createFooterLine = (initial = '') => { + footer = new FooterLine(document, initial); + footer.onPromptChange((e) => { + let request = { + type: 'event.cmd.suggest', + text: e.target.value + }; + browser.runtime.sendMessage(request); + }); + footer.onEntered((e) => { + let request = { + type: 'event.cmd.enter', + text: e.target.value + }; + browser.runtime.sendMessage(request); + }); + footer.focus(); +} + const invokeEvent = (action) => { if (typeof action === 'undefined' || action === null) { return; @@ -11,22 +30,15 @@ const invokeEvent = (action) => { switch (action[0]) { case actions.CMD_OPEN: - footer = new FooterLine(document); - footer.onPromptChange((e) => { - let request = { - type: 'event.cmd.suggest', - text: e.target.value - }; - browser.runtime.sendMessage(request); - }); - footer.onEntered((e) => { - let request = { - type: 'event.cmd.enter', - text: e.target.value - }; - browser.runtime.sendMessage(request); - }); - footer.focus(); + createFooterLine(); + break; + case actions.CMD_TABS_OPEN: + if (action[1] || false) { + // alter url + createFooterLine('open ' + window.location.href); + } else { + createFooterLine('open '); + } break; case actions.SCROLL_UP: scrolls.scrollUp(window, action[1] || 1); diff --git a/src/shared/actions.js b/src/shared/actions.js index 4c9fec4..e1bf1e8 100644 --- a/src/shared/actions.js +++ b/src/shared/actions.js @@ -1,4 +1,5 @@ export const CMD_OPEN = 'cmd.open'; +export const CMD_TABS_OPEN = 'cmd.tabs.open'; export const TABS_PREV = 'tabs.prev'; export const TABS_NEXT = 'tabs.next'; export const SCROLL_UP = 'scroll.up'; @@ -13,6 +14,7 @@ const BACKGROUND_ACTION_SET = new Set([ const CONTENT_ACTION_SET = new Set([ CMD_OPEN, + CMD_TABS_OPEN, SCROLL_UP, SCROLL_DOWN, SCROLL_TOP, -- cgit v1.2.3 From dc860d32f50e2fc21a4f38663bfb0b9099a77513 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Wed, 16 Aug 2017 20:26:02 +0900 Subject: implement d/u command --- manifest.json | 5 ++++- src/background/index.js | 6 ++++++ src/background/key-queue.js | 2 ++ src/background/tabs.js | 22 +++++++++++++++++++++- src/shared/actions.js | 4 ++++ 5 files changed, 37 insertions(+), 2 deletions(-) (limited to 'src/shared') diff --git a/manifest.json b/manifest.json index 2621c5e..1d511fa 100644 --- a/manifest.json +++ b/manifest.json @@ -11,5 +11,8 @@ ], "background": { "scripts": ["build/background.js"] - } + }, + "permissions": [ + "sessions" + ] } diff --git a/src/background/index.js b/src/background/index.js index 8544c0f..f3bd65a 100644 --- a/src/background/index.js +++ b/src/background/index.js @@ -26,6 +26,12 @@ const keyDownHandle = (request, sender, sendResponse) => { const doBackgroundAction = (sender, action) => { switch(action[0]) { + case actions.TABS_CLOSE: + tabs.closeTab(sender.tab.id); + break; + case actions.TABS_REOPEN: + tabs.reopenTab(); + break; case actions.TABS_PREV: tabs.selectPrevTab(sender.tab.index, actions[1] || 1); break; diff --git a/src/background/key-queue.js b/src/background/key-queue.js index 3f25791..d753bc1 100644 --- a/src/background/key-queue.js +++ b/src/background/key-queue.js @@ -9,6 +9,8 @@ const DEFAULT_KEYMAP = [ { keys: [{ code: KeyboardEvent.DOM_VK_J }], action: [ actions.SCROLL_DOWN, 1 ]}, { keys: [{ code: KeyboardEvent.DOM_VK_G }, { code: KeyboardEvent.DOM_VK_G }], action: [ actions.SCROLL_TOP ]}, { keys: [{ code: KeyboardEvent.DOM_VK_G, shift: true }], action: [ actions.SCROLL_BOTTOM ]}, + { keys: [{ code: KeyboardEvent.DOM_VK_D }], action: [ actions.TABS_CLOSE ]}, + { keys: [{ code: KeyboardEvent.DOM_VK_U }], action: [ actions.TABS_REOPEN]}, { keys: [{ code: KeyboardEvent.DOM_VK_H }], action: [ actions.TABS_PREV, 1 ]}, { keys: [{ code: KeyboardEvent.DOM_VK_L }], action: [ actions.TABS_NEXT, 1 ]}, ] diff --git a/src/background/tabs.js b/src/background/tabs.js index 000bd7d..899284d 100644 --- a/src/background/tabs.js +++ b/src/background/tabs.js @@ -1,3 +1,23 @@ +const closeTab = (id) => { + browser.tabs.remove(id); +}; + +const reopenTab = () => { + browser.sessions.getRecentlyClosed({ + maxResults: 1 + }).then((sessions) => { + if (sessions.length === 0) { + return; + } + let session = sessions[0]; + if (session.tab) { + browser.sessions.restore(session.tab.sessionId); + } else { + browser.sessions.restore(session.window.sessionId); + } + }); +}; + const selectPrevTab = (current, count) => { chrome.tabs.query({ currentWindow: true }, (tabs) => { if (tabs.length < 2) { @@ -20,4 +40,4 @@ const selectNextTab = (current, count) => { }); }; -export { selectNextTab, selectPrevTab }; +export { closeTab, reopenTab, selectNextTab, selectPrevTab }; diff --git a/src/shared/actions.js b/src/shared/actions.js index e1bf1e8..be25d72 100644 --- a/src/shared/actions.js +++ b/src/shared/actions.js @@ -1,5 +1,7 @@ export const CMD_OPEN = 'cmd.open'; export const CMD_TABS_OPEN = 'cmd.tabs.open'; +export const TABS_CLOSE = 'tabs.close'; +export const TABS_REOPEN = 'tabs.reopen'; export const TABS_PREV = 'tabs.prev'; export const TABS_NEXT = 'tabs.next'; export const SCROLL_UP = 'scroll.up'; @@ -8,6 +10,8 @@ export const SCROLL_TOP = 'scroll.top'; export const SCROLL_BOTTOM = 'scroll.bottom'; const BACKGROUND_ACTION_SET = new Set([ + TABS_CLOSE, + TABS_REOPEN, TABS_PREV, TABS_NEXT ]); -- cgit v1.2.3